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:01:19 +0000
committer: Ralf Mollik 2018-06-28 15:01:19 +0000
commit: 38b051786c950677afdf941bcd71d3461f80d798 (patch)
tree: a9570dbb5f07d0dd2cc49fe68c71eb1f0ed77996
parent: 4035f374625162807f3eef16d3d7fd353aa43858 (diff)
download: org.eclipse.osbp.xtext.menu-38b051786c950677afdf941bcd71d3461f80d798.tar.gz
org.eclipse.osbp.xtext.menu-38b051786c950677afdf941bcd71d3461f80d798.tar.xz
org.eclipse.osbp.xtext.menu-38b051786c950677afdf941bcd71d3461f80d798.zip
107 files changed, 25068 insertions, 22358 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.menu.feature/LICENSE.txt b/org.eclipse.osbp.xtext.menu.feature/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.menu.feature/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.menu.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.menu.feature/build.properties b/org.eclipse.osbp.xtext.menu.feature/build.properties
index b8920ff..d6b1b0a 100644
--- a/org.eclipse.osbp.xtext.menu.feature/build.properties
+++ b/org.eclipse.osbp.xtext.menu.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.menu.feature/epl-2.0.html b/org.eclipse.osbp.xtext.menu.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu.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.menu.feature/epl-v10.html b/org.eclipse.osbp.xtext.menu.feature/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.menu.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.menu.feature/feature.properties b/org.eclipse.osbp.xtext.menu.feature/feature.properties
index afa216d..d6c708e 100644
--- a/org.eclipse.osbp.xtext.menu.feature/feature.properties
+++ b/org.eclipse.osbp.xtext.menu.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,9 +32,11 @@ 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 ####################################
 
@@ -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.menu.feature/license.html b/org.eclipse.osbp.xtext.menu.feature/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.menu.feature/license.html
+++ b/org.eclipse.osbp.xtext.menu.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.menu.feature/pom.xml b/org.eclipse.osbp.xtext.menu.feature/pom.xml
index 9c854d1..56681d9 100644
--- a/org.eclipse.osbp.xtext.menu.feature/pom.xml
+++ b/org.eclipse.osbp.xtext.menu.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 API and implementation -->
diff --git a/org.eclipse.osbp.xtext.menu.ide/pom.xml b/org.eclipse.osbp.xtext.menu.ide/pom.xml
index 4621ebc..312944a 100644
--- a/org.eclipse.osbp.xtext.menu.ide/pom.xml
+++ b/org.eclipse.osbp.xtext.menu.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.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/MenuDslParser.java b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/MenuDslParser.java
index 55dad26..97e9f3a 100644
--- a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/MenuDslParser.java
+++ b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/MenuDslParser.java
@@ -31,7 +31,8 @@ public class MenuDslParser extends AbstractContentAssistParser {
 			nameMappings = new HashMap<AbstractElement, String>() {
 				private static final long serialVersionUID = 1L;
 				{
-					put(grammarAccess.getMenuEntryAccess().getAlternatives_6(), "rule__MenuEntry__Alternatives_6");
+					put(grammarAccess.getMenuCategoryAccess().getAlternatives_2(), "rule__MenuCategory__Alternatives_2");
+					put(grammarAccess.getMenuEntryAccess().getAlternatives_3(), "rule__MenuEntry__Alternatives_3");
 					put(grammarAccess.getXImportDeclarationAccess().getAlternatives_2(), "rule__XImportDeclaration__Alternatives_2");
 					put(grammarAccess.getXImportDeclarationAccess().getAlternatives_2_0_3(), "rule__XImportDeclaration__Alternatives_2_0_3");
 					put(grammarAccess.getXAnnotationAccess().getAlternatives_3_1(), "rule__XAnnotation__Alternatives_3_1");
@@ -78,16 +79,18 @@ public class MenuDslParser extends AbstractContentAssistParser {
 					put(grammarAccess.getMenuModelAccess().getGroup(), "rule__MenuModel__Group__0");
 					put(grammarAccess.getMenuPackageAccess().getGroup(), "rule__MenuPackage__Group__0");
 					put(grammarAccess.getMenuPackageAccess().getGroup_3(), "rule__MenuPackage__Group_3__0");
-					put(grammarAccess.getMenuPackageAccess().getGroup_3_6(), "rule__MenuPackage__Group_3_6__0");
-					put(grammarAccess.getMenuPackageAccess().getGroup_3_7(), "rule__MenuPackage__Group_3_7__0");
+					put(grammarAccess.getMenuPackageAccess().getGroup_3_4(), "rule__MenuPackage__Group_3_4__0");
+					put(grammarAccess.getMenuPackageAccess().getGroup_3_5(), "rule__MenuPackage__Group_3_5__0");
+					put(grammarAccess.getMenuCategoryAccess().getGroup(), "rule__MenuCategory__Group__0");
+					put(grammarAccess.getMenuCategoryAccess().getGroup_2_0(), "rule__MenuCategory__Group_2_0__0");
+					put(grammarAccess.getMenuCategoryAccess().getGroup_2_1(), "rule__MenuCategory__Group_2_1__0");
+					put(grammarAccess.getMenuCategoryAccess().getGroup_2_6(), "rule__MenuCategory__Group_2_6__0");
+					put(grammarAccess.getMenuTreeAccess().getGroup(), "rule__MenuTree__Group__0");
+					put(grammarAccess.getMenuTreeAccess().getGroup_2(), "rule__MenuTree__Group_2__0");
 					put(grammarAccess.getMenuEntryAccess().getGroup(), "rule__MenuEntry__Group__0");
-					put(grammarAccess.getMenuEntryAccess().getGroup_3(), "rule__MenuEntry__Group_3__0");
-					put(grammarAccess.getMenuEntryAccess().getGroup_4(), "rule__MenuEntry__Group_4__0");
-					put(grammarAccess.getMenuEntryAccess().getGroup_6_0(), "rule__MenuEntry__Group_6_0__0");
-					put(grammarAccess.getMenuEntryAccess().getGroup_6_1(), "rule__MenuEntry__Group_6_1__0");
-					put(grammarAccess.getMenuEntryAccess().getGroup_6_2(), "rule__MenuEntry__Group_6_2__0");
-					put(grammarAccess.getMenuEntryAccess().getGroup_6_3(), "rule__MenuEntry__Group_6_3__0");
-					put(grammarAccess.getMenuEntryAccess().getGroup_7(), "rule__MenuEntry__Group_7__0");
+					put(grammarAccess.getMenuEntryAccess().getGroup_2(), "rule__MenuEntry__Group_2__0");
+					put(grammarAccess.getMenuEntryAccess().getGroup_3_0(), "rule__MenuEntry__Group_3_0__0");
+					put(grammarAccess.getMenuEntryAccess().getGroup_3_1(), "rule__MenuEntry__Group_3_1__0");
 					put(grammarAccess.getXImportDeclarationAccess().getGroup(), "rule__XImportDeclaration__Group__0");
 					put(grammarAccess.getXImportDeclarationAccess().getGroup_2_0(), "rule__XImportDeclaration__Group_2_0__0");
 					put(grammarAccess.getXImportDeclarationAccess().getGroup_2_3(), "rule__XImportDeclaration__Group_2_3__0");
@@ -289,32 +292,35 @@ public class MenuDslParser extends AbstractContentAssistParser {
 					put(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup(), "rule__QualifiedNameWithWildcard__Group__0");
 					put(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup(), "rule__QualifiedNameInStaticImport__Group__0");
 					put(grammarAccess.getMenuModelAccess().getImportSectionAssignment_0(), "rule__MenuModel__ImportSectionAssignment_0");
-					put(grammarAccess.getMenuModelAccess().getPackagesAssignment_1(), "rule__MenuModel__PackagesAssignment_1");
+					put(grammarAccess.getMenuModelAccess().getMenupackageAssignment_1(), "rule__MenuModel__MenupackageAssignment_1");
 					put(grammarAccess.getMenuPackageAccess().getNameAssignment_2(), "rule__MenuPackage__NameAssignment_2");
-					put(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_2(), "rule__MenuPackage__ExpandedImageAssignment_3_2");
-					put(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_4(), "rule__MenuPackage__CollapsedImageAssignment_3_4");
-					put(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAssignment_3_5(), "rule__MenuPackage__SubMenuIsAccordionAssignment_3_5");
-					put(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_6_1(), "rule__MenuPackage__HeightAssignment_3_6_1");
-					put(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_7_1(), "rule__MenuPackage__WidthAssignment_3_7_1");
-					put(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_8(), "rule__MenuPackage__HasDesignerAssignment_3_8");
-					put(grammarAccess.getMenuPackageAccess().getEntriesAssignment_3_9(), "rule__MenuPackage__EntriesAssignment_3_9");
-					put(grammarAccess.getMenuEntryAccess().getEntryidAssignment_2(), "rule__MenuEntry__EntryidAssignment_2");
-					put(grammarAccess.getMenuEntryAccess().getDescriptionAssignment_3_0(), "rule__MenuEntry__DescriptionAssignment_3_0");
-					put(grammarAccess.getMenuEntryAccess().getDescriptionValueAssignment_3_1(), "rule__MenuEntry__DescriptionValueAssignment_3_1");
-					put(grammarAccess.getMenuEntryAccess().getHasImageAssignment_4_0(), "rule__MenuEntry__HasImageAssignment_4_0");
-					put(grammarAccess.getMenuEntryAccess().getImageAssignment_4_1(), "rule__MenuEntry__ImageAssignment_4_1");
-					put(grammarAccess.getMenuEntryAccess().getShowBadgeAssignment_5(), "rule__MenuEntry__ShowBadgeAssignment_5");
-					put(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_6_0_0(), "rule__MenuEntry__HasProcessAssignment_6_0_0");
-					put(grammarAccess.getMenuEntryAccess().getProcessAssignment_6_0_1(), "rule__MenuEntry__ProcessAssignment_6_0_1");
-					put(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_6_1_0(), "rule__MenuEntry__HasPerspectiveAssignment_6_1_0");
-					put(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_6_1_1(), "rule__MenuEntry__PerspectiveAssignment_6_1_1");
-					put(grammarAccess.getMenuEntryAccess().getHasTableAssignment_6_2_0(), "rule__MenuEntry__HasTableAssignment_6_2_0");
-					put(grammarAccess.getMenuEntryAccess().getTableAssignment_6_2_1(), "rule__MenuEntry__TableAssignment_6_2_1");
-					put(grammarAccess.getMenuEntryAccess().getHasDialogAssignment_6_3_0(), "rule__MenuEntry__HasDialogAssignment_6_3_0");
-					put(grammarAccess.getMenuEntryAccess().getDialogAssignment_6_3_1(), "rule__MenuEntry__DialogAssignment_6_3_1");
-					put(grammarAccess.getMenuEntryAccess().getHasUserFilterAssignment_6_4(), "rule__MenuEntry__HasUserFilterAssignment_6_4");
-					put(grammarAccess.getMenuEntryAccess().getHasKeyBindingAssignment_6_5(), "rule__MenuEntry__HasKeyBindingAssignment_6_5");
-					put(grammarAccess.getMenuEntryAccess().getSubentriesAssignment_7_1(), "rule__MenuEntry__SubentriesAssignment_7_1");
+					put(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_1(), "rule__MenuPackage__ExpandedImageAssignment_3_1");
+					put(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_3(), "rule__MenuPackage__CollapsedImageAssignment_3_3");
+					put(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_4_1(), "rule__MenuPackage__HeightAssignment_3_4_1");
+					put(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_5_1(), "rule__MenuPackage__WidthAssignment_3_5_1");
+					put(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_6(), "rule__MenuPackage__HasDesignerAssignment_3_6");
+					put(grammarAccess.getMenuPackageAccess().getCategoriesAssignment_3_7(), "rule__MenuPackage__CategoriesAssignment_3_7");
+					put(grammarAccess.getMenuCategoryAccess().getNameAssignment_1(), "rule__MenuCategory__NameAssignment_1");
+					put(grammarAccess.getMenuCategoryAccess().getHasTableAssignment_2_0_0(), "rule__MenuCategory__HasTableAssignment_2_0_0");
+					put(grammarAccess.getMenuCategoryAccess().getTableAssignment_2_0_1(), "rule__MenuCategory__TableAssignment_2_0_1");
+					put(grammarAccess.getMenuCategoryAccess().getHasDialogAssignment_2_1_0(), "rule__MenuCategory__HasDialogAssignment_2_1_0");
+					put(grammarAccess.getMenuCategoryAccess().getDialogAssignment_2_1_1(), "rule__MenuCategory__DialogAssignment_2_1_1");
+					put(grammarAccess.getMenuCategoryAccess().getHasUserFilterAssignment_2_2(), "rule__MenuCategory__HasUserFilterAssignment_2_2");
+					put(grammarAccess.getMenuCategoryAccess().getHasReportPrinterAssignment_2_3(), "rule__MenuCategory__HasReportPrinterAssignment_2_3");
+					put(grammarAccess.getMenuCategoryAccess().getHasKeyBindingAssignment_2_4(), "rule__MenuCategory__HasKeyBindingAssignment_2_4");
+					put(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsAssignment_2_5(), "rule__MenuCategory__HasSystemSettingsAssignment_2_5");
+					put(grammarAccess.getMenuCategoryAccess().getTreesAssignment_2_6_1(), "rule__MenuCategory__TreesAssignment_2_6_1");
+					put(grammarAccess.getMenuTreeAccess().getNameAssignment_1(), "rule__MenuTree__NameAssignment_1");
+					put(grammarAccess.getMenuTreeAccess().getHasTooltipAssignment_2_0(), "rule__MenuTree__HasTooltipAssignment_2_0");
+					put(grammarAccess.getMenuTreeAccess().getTooltipAssignment_2_1(), "rule__MenuTree__TooltipAssignment_2_1");
+					put(grammarAccess.getMenuTreeAccess().getEntriesAssignment_4(), "rule__MenuTree__EntriesAssignment_4");
+					put(grammarAccess.getMenuEntryAccess().getNameAssignment_1(), "rule__MenuEntry__NameAssignment_1");
+					put(grammarAccess.getMenuEntryAccess().getHasIconAssignment_2_0(), "rule__MenuEntry__HasIconAssignment_2_0");
+					put(grammarAccess.getMenuEntryAccess().getIconAssignment_2_1(), "rule__MenuEntry__IconAssignment_2_1");
+					put(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_3_0_0(), "rule__MenuEntry__HasProcessAssignment_3_0_0");
+					put(grammarAccess.getMenuEntryAccess().getProcessAssignment_3_0_1(), "rule__MenuEntry__ProcessAssignment_3_0_1");
+					put(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_3_1_0(), "rule__MenuEntry__HasPerspectiveAssignment_3_1_0");
+					put(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_3_1_1(), "rule__MenuEntry__PerspectiveAssignment_3_1_1");
 					put(grammarAccess.getXImportDeclarationAccess().getStaticAssignment_2_0_0(), "rule__XImportDeclaration__StaticAssignment_2_0_0");
 					put(grammarAccess.getXImportDeclarationAccess().getExtensionAssignment_2_0_1(), "rule__XImportDeclaration__ExtensionAssignment_2_0_1");
 					put(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_2_0_2(), "rule__XImportDeclaration__ImportedTypeAssignment_2_0_2");
diff --git a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.g b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.g
index 4ec0598..a49444d 100644
--- a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.g
+++ b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.g
@@ -100,6 +100,56 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleMenuCategory
+entryRuleMenuCategory
+:
+{ before(grammarAccess.getMenuCategoryRule()); }
+	 ruleMenuCategory
+{ after(grammarAccess.getMenuCategoryRule()); } 
+	 EOF 
+;
+
+// Rule MenuCategory
+ruleMenuCategory 
+	@init {
+		int stackSize = keepStackSize();
+	}
+	:
+	(
+		{ before(grammarAccess.getMenuCategoryAccess().getGroup()); }
+		(rule__MenuCategory__Group__0)
+		{ after(grammarAccess.getMenuCategoryAccess().getGroup()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleMenuTree
+entryRuleMenuTree
+:
+{ before(grammarAccess.getMenuTreeRule()); }
+	 ruleMenuTree
+{ after(grammarAccess.getMenuTreeRule()); } 
+	 EOF 
+;
+
+// Rule MenuTree
+ruleMenuTree 
+	@init {
+		int stackSize = keepStackSize();
+	}
+	:
+	(
+		{ before(grammarAccess.getMenuTreeAccess().getGroup()); }
+		(rule__MenuTree__Group__0)
+		{ after(grammarAccess.getMenuTreeAccess().getGroup()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleMenuEntry
 entryRuleMenuEntry
 :
@@ -2222,45 +2272,72 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Alternatives_6
+rule__MenuCategory__Alternatives_2
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getGroup_6_0()); }
-		(rule__MenuEntry__Group_6_0__0)
-		{ after(grammarAccess.getMenuEntryAccess().getGroup_6_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getGroup_2_0()); }
+		(rule__MenuCategory__Group_2_0__0)
+		{ after(grammarAccess.getMenuCategoryAccess().getGroup_2_0()); }
 	)
 	|
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getGroup_6_1()); }
-		(rule__MenuEntry__Group_6_1__0)
-		{ after(grammarAccess.getMenuEntryAccess().getGroup_6_1()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getGroup_2_1()); }
+		(rule__MenuCategory__Group_2_1__0)
+		{ after(grammarAccess.getMenuCategoryAccess().getGroup_2_1()); }
 	)
 	|
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getGroup_6_2()); }
-		(rule__MenuEntry__Group_6_2__0)
-		{ after(grammarAccess.getMenuEntryAccess().getGroup_6_2()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasUserFilterAssignment_2_2()); }
+		(rule__MenuCategory__HasUserFilterAssignment_2_2)
+		{ after(grammarAccess.getMenuCategoryAccess().getHasUserFilterAssignment_2_2()); }
 	)
 	|
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getGroup_6_3()); }
-		(rule__MenuEntry__Group_6_3__0)
-		{ after(grammarAccess.getMenuEntryAccess().getGroup_6_3()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasReportPrinterAssignment_2_3()); }
+		(rule__MenuCategory__HasReportPrinterAssignment_2_3)
+		{ after(grammarAccess.getMenuCategoryAccess().getHasReportPrinterAssignment_2_3()); }
 	)
 	|
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasUserFilterAssignment_6_4()); }
-		(rule__MenuEntry__HasUserFilterAssignment_6_4)
-		{ after(grammarAccess.getMenuEntryAccess().getHasUserFilterAssignment_6_4()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasKeyBindingAssignment_2_4()); }
+		(rule__MenuCategory__HasKeyBindingAssignment_2_4)
+		{ after(grammarAccess.getMenuCategoryAccess().getHasKeyBindingAssignment_2_4()); }
 	)
 	|
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasKeyBindingAssignment_6_5()); }
-		(rule__MenuEntry__HasKeyBindingAssignment_6_5)
-		{ after(grammarAccess.getMenuEntryAccess().getHasKeyBindingAssignment_6_5()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsAssignment_2_5()); }
+		(rule__MenuCategory__HasSystemSettingsAssignment_2_5)
+		{ after(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsAssignment_2_5()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getMenuCategoryAccess().getGroup_2_6()); }
+		(rule__MenuCategory__Group_2_6__0)
+		{ after(grammarAccess.getMenuCategoryAccess().getGroup_2_6()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MenuEntry__Alternatives_3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getMenuEntryAccess().getGroup_3_0()); }
+		(rule__MenuEntry__Group_3_0__0)
+		{ after(grammarAccess.getMenuEntryAccess().getGroup_3_0()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getMenuEntryAccess().getGroup_3_1()); }
+		(rule__MenuEntry__Group_3_1__0)
+		{ after(grammarAccess.getMenuEntryAccess().getGroup_3_1()); }
 	)
 ;
 finally {
@@ -3478,9 +3555,9 @@ rule__MenuModel__Group__1__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuModelAccess().getPackagesAssignment_1()); }
-	(rule__MenuModel__PackagesAssignment_1)*
-	{ after(grammarAccess.getMenuModelAccess().getPackagesAssignment_1()); }
+	{ before(grammarAccess.getMenuModelAccess().getMenupackageAssignment_1()); }
+	(rule__MenuModel__MenupackageAssignment_1)
+	{ after(grammarAccess.getMenuModelAccess().getMenupackageAssignment_1()); }
 )
 ;
 finally {
@@ -3614,9 +3691,9 @@ rule__MenuPackage__Group_3__0__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getLeftCurlyBracketKeyword_3_0()); }
-	'{'
-	{ after(grammarAccess.getMenuPackageAccess().getLeftCurlyBracketKeyword_3_0()); }
+	{ before(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_0()); }
+	'expandedImage'
+	{ after(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_0()); }
 )
 ;
 finally {
@@ -3641,9 +3718,9 @@ rule__MenuPackage__Group_3__1__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_1()); }
-	'expandedImage'
-	{ after(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_1()); }
+	{ before(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_1()); }
+	(rule__MenuPackage__ExpandedImageAssignment_3_1)
+	{ after(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_1()); }
 )
 ;
 finally {
@@ -3668,9 +3745,9 @@ rule__MenuPackage__Group_3__2__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_2()); }
-	(rule__MenuPackage__ExpandedImageAssignment_3_2)
-	{ after(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_2()); }
+	{ before(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_2()); }
+	'collapsedImage'
+	{ after(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_2()); }
 )
 ;
 finally {
@@ -3695,9 +3772,9 @@ rule__MenuPackage__Group_3__3__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_3()); }
-	'collapsedImage'
-	{ after(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_3()); }
+	{ before(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_3()); }
+	(rule__MenuPackage__CollapsedImageAssignment_3_3)
+	{ after(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_3()); }
 )
 ;
 finally {
@@ -3722,9 +3799,9 @@ rule__MenuPackage__Group_3__4__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_4()); }
-	(rule__MenuPackage__CollapsedImageAssignment_3_4)
-	{ after(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_4()); }
+	{ before(grammarAccess.getMenuPackageAccess().getGroup_3_4()); }
+	(rule__MenuPackage__Group_3_4__0)?
+	{ after(grammarAccess.getMenuPackageAccess().getGroup_3_4()); }
 )
 ;
 finally {
@@ -3749,9 +3826,9 @@ rule__MenuPackage__Group_3__5__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAssignment_3_5()); }
-	(rule__MenuPackage__SubMenuIsAccordionAssignment_3_5)?
-	{ after(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAssignment_3_5()); }
+	{ before(grammarAccess.getMenuPackageAccess().getGroup_3_5()); }
+	(rule__MenuPackage__Group_3_5__0)?
+	{ after(grammarAccess.getMenuPackageAccess().getGroup_3_5()); }
 )
 ;
 finally {
@@ -3776,9 +3853,9 @@ rule__MenuPackage__Group_3__6__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getGroup_3_6()); }
-	(rule__MenuPackage__Group_3_6__0)?
-	{ after(grammarAccess.getMenuPackageAccess().getGroup_3_6()); }
+	{ before(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_6()); }
+	(rule__MenuPackage__HasDesignerAssignment_3_6)?
+	{ after(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_6()); }
 )
 ;
 finally {
@@ -3791,7 +3868,6 @@ rule__MenuPackage__Group_3__7
 	}
 :
 	rule__MenuPackage__Group_3__7__Impl
-	rule__MenuPackage__Group_3__8
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -3803,197 +3879,198 @@ rule__MenuPackage__Group_3__7__Impl
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getGroup_3_7()); }
-	(rule__MenuPackage__Group_3_7__0)?
-	{ after(grammarAccess.getMenuPackageAccess().getGroup_3_7()); }
+	{ before(grammarAccess.getMenuPackageAccess().getCategoriesAssignment_3_7()); }
+	(rule__MenuPackage__CategoriesAssignment_3_7)*
+	{ after(grammarAccess.getMenuPackageAccess().getCategoriesAssignment_3_7()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3__8
+
+rule__MenuPackage__Group_3_4__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuPackage__Group_3__8__Impl
-	rule__MenuPackage__Group_3__9
+	rule__MenuPackage__Group_3_4__0__Impl
+	rule__MenuPackage__Group_3_4__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3__8__Impl
+rule__MenuPackage__Group_3_4__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_8()); }
-	(rule__MenuPackage__HasDesignerAssignment_3_8)?
-	{ after(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_8()); }
+	{ before(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_4_0()); }
+	'height'
+	{ after(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_4_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3__9
+rule__MenuPackage__Group_3_4__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuPackage__Group_3__9__Impl
-	rule__MenuPackage__Group_3__10
+	rule__MenuPackage__Group_3_4__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3__9__Impl
+rule__MenuPackage__Group_3_4__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getEntriesAssignment_3_9()); }
-	(rule__MenuPackage__EntriesAssignment_3_9)*
-	{ after(grammarAccess.getMenuPackageAccess().getEntriesAssignment_3_9()); }
+	{ before(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_4_1()); }
+	(rule__MenuPackage__HeightAssignment_3_4_1)
+	{ after(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_4_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3__10
+
+rule__MenuPackage__Group_3_5__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuPackage__Group_3__10__Impl
+	rule__MenuPackage__Group_3_5__0__Impl
+	rule__MenuPackage__Group_3_5__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3__10__Impl
+rule__MenuPackage__Group_3_5__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getRightCurlyBracketKeyword_3_10()); }
-	'}'
-	{ after(grammarAccess.getMenuPackageAccess().getRightCurlyBracketKeyword_3_10()); }
+	{ before(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_5_0()); }
+	'width'
+	{ after(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_5_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-
-rule__MenuPackage__Group_3_6__0
+rule__MenuPackage__Group_3_5__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuPackage__Group_3_6__0__Impl
-	rule__MenuPackage__Group_3_6__1
+	rule__MenuPackage__Group_3_5__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3_6__0__Impl
+rule__MenuPackage__Group_3_5__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_6_0()); }
-	'height'
-	{ after(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_6_0()); }
+	{ before(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_5_1()); }
+	(rule__MenuPackage__WidthAssignment_3_5_1)
+	{ after(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_5_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3_6__1
+
+rule__MenuCategory__Group__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuPackage__Group_3_6__1__Impl
+	rule__MenuCategory__Group__0__Impl
+	rule__MenuCategory__Group__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3_6__1__Impl
+rule__MenuCategory__Group__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_6_1()); }
-	(rule__MenuPackage__HeightAssignment_3_6_1)
-	{ after(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_6_1()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getCategoryKeyword_0()); }
+	'category'
+	{ after(grammarAccess.getMenuCategoryAccess().getCategoryKeyword_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-
-rule__MenuPackage__Group_3_7__0
+rule__MenuCategory__Group__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuPackage__Group_3_7__0__Impl
-	rule__MenuPackage__Group_3_7__1
+	rule__MenuCategory__Group__1__Impl
+	rule__MenuCategory__Group__2
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3_7__0__Impl
+rule__MenuCategory__Group__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_7_0()); }
-	'width'
-	{ after(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_7_0()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getNameAssignment_1()); }
+	(rule__MenuCategory__NameAssignment_1)
+	{ after(grammarAccess.getMenuCategoryAccess().getNameAssignment_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3_7__1
+rule__MenuCategory__Group__2
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuPackage__Group_3_7__1__Impl
+	rule__MenuCategory__Group__2__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__Group_3_7__1__Impl
+rule__MenuCategory__Group__2__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_7_1()); }
-	(rule__MenuPackage__WidthAssignment_3_7_1)
-	{ after(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_7_1()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getAlternatives_2()); }
+	(rule__MenuCategory__Alternatives_2)?
+	{ after(grammarAccess.getMenuCategoryAccess().getAlternatives_2()); }
 )
 ;
 finally {
@@ -4001,323 +4078,350 @@ finally {
 }
 
 
-rule__MenuEntry__Group__0
+rule__MenuCategory__Group_2_0__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__0__Impl
-	rule__MenuEntry__Group__1
+	rule__MenuCategory__Group_2_0__0__Impl
+	rule__MenuCategory__Group_2_0__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__0__Impl
+rule__MenuCategory__Group_2_0__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getMenuEntryAction_0()); }
-	()
-	{ after(grammarAccess.getMenuEntryAccess().getMenuEntryAction_0()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getHasTableAssignment_2_0_0()); }
+	(rule__MenuCategory__HasTableAssignment_2_0_0)
+	{ after(grammarAccess.getMenuCategoryAccess().getHasTableAssignment_2_0_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__1
+rule__MenuCategory__Group_2_0__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__1__Impl
-	rule__MenuEntry__Group__2
+	rule__MenuCategory__Group_2_0__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__1__Impl
+rule__MenuCategory__Group_2_0__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getEntryKeyword_1()); }
-	'entry'
-	{ after(grammarAccess.getMenuEntryAccess().getEntryKeyword_1()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getTableAssignment_2_0_1()); }
+	(rule__MenuCategory__TableAssignment_2_0_1)
+	{ after(grammarAccess.getMenuCategoryAccess().getTableAssignment_2_0_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__2
+
+rule__MenuCategory__Group_2_1__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__2__Impl
-	rule__MenuEntry__Group__3
+	rule__MenuCategory__Group_2_1__0__Impl
+	rule__MenuCategory__Group_2_1__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__2__Impl
+rule__MenuCategory__Group_2_1__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getEntryidAssignment_2()); }
-	(rule__MenuEntry__EntryidAssignment_2)
-	{ after(grammarAccess.getMenuEntryAccess().getEntryidAssignment_2()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getHasDialogAssignment_2_1_0()); }
+	(rule__MenuCategory__HasDialogAssignment_2_1_0)
+	{ after(grammarAccess.getMenuCategoryAccess().getHasDialogAssignment_2_1_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__3
+rule__MenuCategory__Group_2_1__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__3__Impl
-	rule__MenuEntry__Group__4
+	rule__MenuCategory__Group_2_1__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__3__Impl
+rule__MenuCategory__Group_2_1__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getGroup_3()); }
-	(rule__MenuEntry__Group_3__0)?
-	{ after(grammarAccess.getMenuEntryAccess().getGroup_3()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getDialogAssignment_2_1_1()); }
+	(rule__MenuCategory__DialogAssignment_2_1_1)
+	{ after(grammarAccess.getMenuCategoryAccess().getDialogAssignment_2_1_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__4
+
+rule__MenuCategory__Group_2_6__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__4__Impl
-	rule__MenuEntry__Group__5
+	rule__MenuCategory__Group_2_6__0__Impl
+	rule__MenuCategory__Group_2_6__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__4__Impl
+rule__MenuCategory__Group_2_6__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getGroup_4()); }
-	(rule__MenuEntry__Group_4__0)?
-	{ after(grammarAccess.getMenuEntryAccess().getGroup_4()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getLeftCurlyBracketKeyword_2_6_0()); }
+	'{'
+	{ after(grammarAccess.getMenuCategoryAccess().getLeftCurlyBracketKeyword_2_6_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__5
+rule__MenuCategory__Group_2_6__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__5__Impl
-	rule__MenuEntry__Group__6
+	rule__MenuCategory__Group_2_6__1__Impl
+	rule__MenuCategory__Group_2_6__2
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__5__Impl
+rule__MenuCategory__Group_2_6__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getShowBadgeAssignment_5()); }
-	(rule__MenuEntry__ShowBadgeAssignment_5)?
-	{ after(grammarAccess.getMenuEntryAccess().getShowBadgeAssignment_5()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getTreesAssignment_2_6_1()); }
+	(rule__MenuCategory__TreesAssignment_2_6_1)*
+	{ after(grammarAccess.getMenuCategoryAccess().getTreesAssignment_2_6_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__6
+rule__MenuCategory__Group_2_6__2
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__6__Impl
-	rule__MenuEntry__Group__7
+	rule__MenuCategory__Group_2_6__2__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__6__Impl
+rule__MenuCategory__Group_2_6__2__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getAlternatives_6()); }
-	(rule__MenuEntry__Alternatives_6)?
-	{ after(grammarAccess.getMenuEntryAccess().getAlternatives_6()); }
+	{ before(grammarAccess.getMenuCategoryAccess().getRightCurlyBracketKeyword_2_6_2()); }
+	'}'
+	{ after(grammarAccess.getMenuCategoryAccess().getRightCurlyBracketKeyword_2_6_2()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__7
+
+rule__MenuTree__Group__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group__7__Impl
+	rule__MenuTree__Group__0__Impl
+	rule__MenuTree__Group__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group__7__Impl
+rule__MenuTree__Group__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getGroup_7()); }
-	(rule__MenuEntry__Group_7__0)?
-	{ after(grammarAccess.getMenuEntryAccess().getGroup_7()); }
+	{ before(grammarAccess.getMenuTreeAccess().getTreeKeyword_0()); }
+	'tree'
+	{ after(grammarAccess.getMenuTreeAccess().getTreeKeyword_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-
-rule__MenuEntry__Group_3__0
+rule__MenuTree__Group__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_3__0__Impl
-	rule__MenuEntry__Group_3__1
+	rule__MenuTree__Group__1__Impl
+	rule__MenuTree__Group__2
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_3__0__Impl
+rule__MenuTree__Group__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getDescriptionAssignment_3_0()); }
-	(rule__MenuEntry__DescriptionAssignment_3_0)
-	{ after(grammarAccess.getMenuEntryAccess().getDescriptionAssignment_3_0()); }
+	{ before(grammarAccess.getMenuTreeAccess().getNameAssignment_1()); }
+	(rule__MenuTree__NameAssignment_1)
+	{ after(grammarAccess.getMenuTreeAccess().getNameAssignment_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_3__1
+rule__MenuTree__Group__2
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_3__1__Impl
+	rule__MenuTree__Group__2__Impl
+	rule__MenuTree__Group__3
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_3__1__Impl
+rule__MenuTree__Group__2__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getDescriptionValueAssignment_3_1()); }
-	(rule__MenuEntry__DescriptionValueAssignment_3_1)
-	{ after(grammarAccess.getMenuEntryAccess().getDescriptionValueAssignment_3_1()); }
+	{ before(grammarAccess.getMenuTreeAccess().getGroup_2()); }
+	(rule__MenuTree__Group_2__0)?
+	{ after(grammarAccess.getMenuTreeAccess().getGroup_2()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
+rule__MenuTree__Group__3
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__MenuTree__Group__3__Impl
+	rule__MenuTree__Group__4
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MenuTree__Group__3__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getMenuTreeAccess().getLeftCurlyBracketKeyword_3()); }
+	'{'
+	{ after(grammarAccess.getMenuTreeAccess().getLeftCurlyBracketKeyword_3()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
 
-rule__MenuEntry__Group_4__0
+rule__MenuTree__Group__4
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_4__0__Impl
-	rule__MenuEntry__Group_4__1
+	rule__MenuTree__Group__4__Impl
+	rule__MenuTree__Group__5
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_4__0__Impl
+rule__MenuTree__Group__4__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getHasImageAssignment_4_0()); }
-	(rule__MenuEntry__HasImageAssignment_4_0)
-	{ after(grammarAccess.getMenuEntryAccess().getHasImageAssignment_4_0()); }
+	{ before(grammarAccess.getMenuTreeAccess().getEntriesAssignment_4()); }
+	(rule__MenuTree__EntriesAssignment_4)*
+	{ after(grammarAccess.getMenuTreeAccess().getEntriesAssignment_4()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_4__1
+rule__MenuTree__Group__5
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_4__1__Impl
+	rule__MenuTree__Group__5__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_4__1__Impl
+rule__MenuTree__Group__5__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getImageAssignment_4_1()); }
-	(rule__MenuEntry__ImageAssignment_4_1)
-	{ after(grammarAccess.getMenuEntryAccess().getImageAssignment_4_1()); }
+	{ before(grammarAccess.getMenuTreeAccess().getRightCurlyBracketKeyword_5()); }
+	'}'
+	{ after(grammarAccess.getMenuTreeAccess().getRightCurlyBracketKeyword_5()); }
 )
 ;
 finally {
@@ -4325,53 +4429,53 @@ finally {
 }
 
 
-rule__MenuEntry__Group_6_0__0
+rule__MenuTree__Group_2__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_0__0__Impl
-	rule__MenuEntry__Group_6_0__1
+	rule__MenuTree__Group_2__0__Impl
+	rule__MenuTree__Group_2__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_0__0__Impl
+rule__MenuTree__Group_2__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_6_0_0()); }
-	(rule__MenuEntry__HasProcessAssignment_6_0_0)
-	{ after(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_6_0_0()); }
+	{ before(grammarAccess.getMenuTreeAccess().getHasTooltipAssignment_2_0()); }
+	(rule__MenuTree__HasTooltipAssignment_2_0)
+	{ after(grammarAccess.getMenuTreeAccess().getHasTooltipAssignment_2_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_0__1
+rule__MenuTree__Group_2__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_0__1__Impl
+	rule__MenuTree__Group_2__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_0__1__Impl
+rule__MenuTree__Group_2__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getProcessAssignment_6_0_1()); }
-	(rule__MenuEntry__ProcessAssignment_6_0_1)
-	{ after(grammarAccess.getMenuEntryAccess().getProcessAssignment_6_0_1()); }
+	{ before(grammarAccess.getMenuTreeAccess().getTooltipAssignment_2_1()); }
+	(rule__MenuTree__TooltipAssignment_2_1)
+	{ after(grammarAccess.getMenuTreeAccess().getTooltipAssignment_2_1()); }
 )
 ;
 finally {
@@ -4379,107 +4483,107 @@ finally {
 }
 
 
-rule__MenuEntry__Group_6_1__0
+rule__MenuEntry__Group__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_1__0__Impl
-	rule__MenuEntry__Group_6_1__1
+	rule__MenuEntry__Group__0__Impl
+	rule__MenuEntry__Group__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_1__0__Impl
+rule__MenuEntry__Group__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_6_1_0()); }
-	(rule__MenuEntry__HasPerspectiveAssignment_6_1_0)
-	{ after(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_6_1_0()); }
+	{ before(grammarAccess.getMenuEntryAccess().getEntryKeyword_0()); }
+	'entry'
+	{ after(grammarAccess.getMenuEntryAccess().getEntryKeyword_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_1__1
+rule__MenuEntry__Group__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_1__1__Impl
+	rule__MenuEntry__Group__1__Impl
+	rule__MenuEntry__Group__2
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_1__1__Impl
+rule__MenuEntry__Group__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_6_1_1()); }
-	(rule__MenuEntry__PerspectiveAssignment_6_1_1)
-	{ after(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_6_1_1()); }
+	{ before(grammarAccess.getMenuEntryAccess().getNameAssignment_1()); }
+	(rule__MenuEntry__NameAssignment_1)
+	{ after(grammarAccess.getMenuEntryAccess().getNameAssignment_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-
-rule__MenuEntry__Group_6_2__0
+rule__MenuEntry__Group__2
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_2__0__Impl
-	rule__MenuEntry__Group_6_2__1
+	rule__MenuEntry__Group__2__Impl
+	rule__MenuEntry__Group__3
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_2__0__Impl
+rule__MenuEntry__Group__2__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getHasTableAssignment_6_2_0()); }
-	(rule__MenuEntry__HasTableAssignment_6_2_0)
-	{ after(grammarAccess.getMenuEntryAccess().getHasTableAssignment_6_2_0()); }
+	{ before(grammarAccess.getMenuEntryAccess().getGroup_2()); }
+	(rule__MenuEntry__Group_2__0)?
+	{ after(grammarAccess.getMenuEntryAccess().getGroup_2()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_2__1
+rule__MenuEntry__Group__3
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_2__1__Impl
+	rule__MenuEntry__Group__3__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_2__1__Impl
+rule__MenuEntry__Group__3__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getTableAssignment_6_2_1()); }
-	(rule__MenuEntry__TableAssignment_6_2_1)
-	{ after(grammarAccess.getMenuEntryAccess().getTableAssignment_6_2_1()); }
+	{ before(grammarAccess.getMenuEntryAccess().getAlternatives_3()); }
+	(rule__MenuEntry__Alternatives_3)
+	{ after(grammarAccess.getMenuEntryAccess().getAlternatives_3()); }
 )
 ;
 finally {
@@ -4487,53 +4591,53 @@ finally {
 }
 
 
-rule__MenuEntry__Group_6_3__0
+rule__MenuEntry__Group_2__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_3__0__Impl
-	rule__MenuEntry__Group_6_3__1
+	rule__MenuEntry__Group_2__0__Impl
+	rule__MenuEntry__Group_2__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_3__0__Impl
+rule__MenuEntry__Group_2__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getHasDialogAssignment_6_3_0()); }
-	(rule__MenuEntry__HasDialogAssignment_6_3_0)
-	{ after(grammarAccess.getMenuEntryAccess().getHasDialogAssignment_6_3_0()); }
+	{ before(grammarAccess.getMenuEntryAccess().getHasIconAssignment_2_0()); }
+	(rule__MenuEntry__HasIconAssignment_2_0)
+	{ after(grammarAccess.getMenuEntryAccess().getHasIconAssignment_2_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_3__1
+rule__MenuEntry__Group_2__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_6_3__1__Impl
+	rule__MenuEntry__Group_2__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_6_3__1__Impl
+rule__MenuEntry__Group_2__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getDialogAssignment_6_3_1()); }
-	(rule__MenuEntry__DialogAssignment_6_3_1)
-	{ after(grammarAccess.getMenuEntryAccess().getDialogAssignment_6_3_1()); }
+	{ before(grammarAccess.getMenuEntryAccess().getIconAssignment_2_1()); }
+	(rule__MenuEntry__IconAssignment_2_1)
+	{ after(grammarAccess.getMenuEntryAccess().getIconAssignment_2_1()); }
 )
 ;
 finally {
@@ -4541,80 +4645,107 @@ finally {
 }
 
 
-rule__MenuEntry__Group_7__0
+rule__MenuEntry__Group_3_0__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_7__0__Impl
-	rule__MenuEntry__Group_7__1
+	rule__MenuEntry__Group_3_0__0__Impl
+	rule__MenuEntry__Group_3_0__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_7__0__Impl
+rule__MenuEntry__Group_3_0__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getLeftCurlyBracketKeyword_7_0()); }
-	'{'
-	{ after(grammarAccess.getMenuEntryAccess().getLeftCurlyBracketKeyword_7_0()); }
+	{ before(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_3_0_0()); }
+	(rule__MenuEntry__HasProcessAssignment_3_0_0)
+	{ after(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_3_0_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_7__1
+rule__MenuEntry__Group_3_0__1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_7__1__Impl
-	rule__MenuEntry__Group_7__2
+	rule__MenuEntry__Group_3_0__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_7__1__Impl
+rule__MenuEntry__Group_3_0__1__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getSubentriesAssignment_7_1()); }
-	(rule__MenuEntry__SubentriesAssignment_7_1)*
-	{ after(grammarAccess.getMenuEntryAccess().getSubentriesAssignment_7_1()); }
+	{ before(grammarAccess.getMenuEntryAccess().getProcessAssignment_3_0_1()); }
+	(rule__MenuEntry__ProcessAssignment_3_0_1)
+	{ after(grammarAccess.getMenuEntryAccess().getProcessAssignment_3_0_1()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_7__2
+
+rule__MenuEntry__Group_3_1__0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
-	rule__MenuEntry__Group_7__2__Impl
+	rule__MenuEntry__Group_3_1__0__Impl
+	rule__MenuEntry__Group_3_1__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__Group_7__2__Impl
+rule__MenuEntry__Group_3_1__0__Impl
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 (
-	{ before(grammarAccess.getMenuEntryAccess().getRightCurlyBracketKeyword_7_2()); }
-	'}'
-	{ after(grammarAccess.getMenuEntryAccess().getRightCurlyBracketKeyword_7_2()); }
+	{ before(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_3_1_0()); }
+	(rule__MenuEntry__HasPerspectiveAssignment_3_1_0)
+	{ after(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_3_1_0()); }
+)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MenuEntry__Group_3_1__1
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	rule__MenuEntry__Group_3_1__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MenuEntry__Group_3_1__1__Impl
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+(
+	{ before(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_3_1_1()); }
+	(rule__MenuEntry__PerspectiveAssignment_3_1_1)
+	{ after(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_3_1_1()); }
 )
 ;
 finally {
@@ -17557,15 +17688,15 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuModel__PackagesAssignment_1
+rule__MenuModel__MenupackageAssignment_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuModelAccess().getPackagesMenuPackageParserRuleCall_1_0()); }
+		{ before(grammarAccess.getMenuModelAccess().getMenupackageMenuPackageParserRuleCall_1_0()); }
 		ruleMenuPackage
-		{ after(grammarAccess.getMenuModelAccess().getPackagesMenuPackageParserRuleCall_1_0()); }
+		{ after(grammarAccess.getMenuModelAccess().getMenupackageMenuPackageParserRuleCall_1_0()); }
 	)
 ;
 finally {
@@ -17587,420 +17718,465 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__ExpandedImageAssignment_3_2
+rule__MenuPackage__ExpandedImageAssignment_3_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_2_0()); }
+		{ before(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_1_0()); }
 		RULE_STRING
-		{ after(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_2_0()); }
+		{ after(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__CollapsedImageAssignment_3_4
+rule__MenuPackage__CollapsedImageAssignment_3_3
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_4_0()); }
+		{ before(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_3_0()); }
 		RULE_STRING
-		{ after(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_4_0()); }
+		{ after(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_3_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__SubMenuIsAccordionAssignment_3_5
+rule__MenuPackage__HeightAssignment_3_4_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); }
-		(
-			{ before(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); }
-			'accordionSubmenu'
-			{ after(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); }
-		)
-		{ after(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); }
+		{ before(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_4_1_0()); }
+		RULE_STRING
+		{ after(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_4_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__HeightAssignment_3_6_1
+rule__MenuPackage__WidthAssignment_3_5_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_6_1_0()); }
+		{ before(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_5_1_0()); }
 		RULE_STRING
-		{ after(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_6_1_0()); }
+		{ after(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_5_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__WidthAssignment_3_7_1
+rule__MenuPackage__HasDesignerAssignment_3_6
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_7_1_0()); }
-		RULE_STRING
-		{ after(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_7_1_0()); }
+		{ before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); }
+		(
+			{ before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); }
+			'designer'
+			{ after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); }
+		)
+		{ after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__HasDesignerAssignment_3_8
+rule__MenuPackage__CategoriesAssignment_3_7
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); }
-		(
-			{ before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); }
-			'designer'
-			{ after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); }
-		)
-		{ after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); }
+		{ before(grammarAccess.getMenuPackageAccess().getCategoriesMenuCategoryParserRuleCall_3_7_0()); }
+		ruleMenuCategory
+		{ after(grammarAccess.getMenuPackageAccess().getCategoriesMenuCategoryParserRuleCall_3_7_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuPackage__EntriesAssignment_3_9
+rule__MenuCategory__NameAssignment_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuPackageAccess().getEntriesMenuEntryParserRuleCall_3_9_0()); }
-		ruleMenuEntry
-		{ after(grammarAccess.getMenuPackageAccess().getEntriesMenuEntryParserRuleCall_3_9_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); }
+		ruleTRANSLATABLEID
+		{ after(grammarAccess.getMenuCategoryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__EntryidAssignment_2
+rule__MenuCategory__HasTableAssignment_2_0_0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getEntryidTRANSLATABLEIDParserRuleCall_2_0()); }
-		ruleTRANSLATABLEID
-		{ after(grammarAccess.getMenuEntryAccess().getEntryidTRANSLATABLEIDParserRuleCall_2_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); }
+		(
+			{ before(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); }
+			'table'
+			{ after(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); }
+		)
+		{ after(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__DescriptionAssignment_3_0
+rule__MenuCategory__TableAssignment_2_0_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getTableTableCrossReference_2_0_1_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); }
-			'describedBy'
-			{ after(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); }
+			{ before(grammarAccess.getMenuCategoryAccess().getTableTableIDTerminalRuleCall_2_0_1_0_1()); }
+			RULE_ID
+			{ after(grammarAccess.getMenuCategoryAccess().getTableTableIDTerminalRuleCall_2_0_1_0_1()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); }
+		{ after(grammarAccess.getMenuCategoryAccess().getTableTableCrossReference_2_0_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__DescriptionValueAssignment_3_1
+rule__MenuCategory__HasDialogAssignment_2_1_0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0()); }
-		ruleTRANSLATABLESTRING
-		{ after(grammarAccess.getMenuEntryAccess().getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); }
+		(
+			{ before(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); }
+			'dialog'
+			{ after(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); }
+		)
+		{ after(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__HasImageAssignment_4_0
+rule__MenuCategory__DialogAssignment_2_1_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getDialogDialogCrossReference_2_1_1_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); }
-			'image'
-			{ after(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); }
+			{ before(grammarAccess.getMenuCategoryAccess().getDialogDialogIDTerminalRuleCall_2_1_1_0_1()); }
+			RULE_ID
+			{ after(grammarAccess.getMenuCategoryAccess().getDialogDialogIDTerminalRuleCall_2_1_1_0_1()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); }
+		{ after(grammarAccess.getMenuCategoryAccess().getDialogDialogCrossReference_2_1_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__ImageAssignment_4_1
+rule__MenuCategory__HasUserFilterAssignment_2_2
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getImageSTRINGTerminalRuleCall_4_1_0()); }
-		RULE_STRING
-		{ after(grammarAccess.getMenuEntryAccess().getImageSTRINGTerminalRuleCall_4_1_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); }
+		(
+			{ before(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); }
+			'userFilter'
+			{ after(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); }
+		)
+		{ after(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__ShowBadgeAssignment_5
+rule__MenuCategory__HasReportPrinterAssignment_2_3
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); }
-			'showBadge'
-			{ after(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); }
+			{ before(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); }
+			'reportPrinter'
+			{ after(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); }
+		{ after(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__HasProcessAssignment_6_0_0
+rule__MenuCategory__HasKeyBindingAssignment_2_4
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); }
-			'process'
-			{ after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); }
+			{ before(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); }
+			'keyBinding'
+			{ after(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); }
+		{ after(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__ProcessAssignment_6_0_1
+rule__MenuCategory__HasSystemSettingsAssignment_2_5
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_6_0_1_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_6_0_1_0_1()); }
-			RULE_ID
-			{ after(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_6_0_1_0_1()); }
+			{ before(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); }
+			'systemSettings'
+			{ after(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_6_0_1_0()); }
+		{ after(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__HasPerspectiveAssignment_6_1_0
+rule__MenuCategory__TreesAssignment_2_6_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); }
-		(
-			{ before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); }
-			'perspective'
-			{ after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); }
-		)
-		{ after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); }
+		{ before(grammarAccess.getMenuCategoryAccess().getTreesMenuTreeParserRuleCall_2_6_1_0()); }
+		ruleMenuTree
+		{ after(grammarAccess.getMenuCategoryAccess().getTreesMenuTreeParserRuleCall_2_6_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__PerspectiveAssignment_6_1_1
+rule__MenuTree__NameAssignment_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_6_1_1_0()); }
-		(
-			{ before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_6_1_1_0_1()); }
-			RULE_ID
-			{ after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_6_1_1_0_1()); }
-		)
-		{ after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_6_1_1_0()); }
+		{ before(grammarAccess.getMenuTreeAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); }
+		ruleTRANSLATABLEID
+		{ after(grammarAccess.getMenuTreeAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__HasTableAssignment_6_2_0
+rule__MenuTree__HasTooltipAssignment_2_0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); }
+		{ before(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); }
-			'table'
-			{ after(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); }
+			{ before(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); }
+			'tooltip'
+			{ after(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); }
+		{ after(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__TableAssignment_6_2_1
+rule__MenuTree__TooltipAssignment_2_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getTableTableCrossReference_6_2_1_0()); }
-		(
-			{ before(grammarAccess.getMenuEntryAccess().getTableTableIDTerminalRuleCall_6_2_1_0_1()); }
-			RULE_ID
-			{ after(grammarAccess.getMenuEntryAccess().getTableTableIDTerminalRuleCall_6_2_1_0_1()); }
-		)
-		{ after(grammarAccess.getMenuEntryAccess().getTableTableCrossReference_6_2_1_0()); }
+		{ before(grammarAccess.getMenuTreeAccess().getTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0()); }
+		ruleTRANSLATABLESTRING
+		{ after(grammarAccess.getMenuTreeAccess().getTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MenuTree__EntriesAssignment_4
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getMenuTreeAccess().getEntriesMenuEntryParserRuleCall_4_0()); }
+		ruleMenuEntry
+		{ after(grammarAccess.getMenuTreeAccess().getEntriesMenuEntryParserRuleCall_4_0()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MenuEntry__NameAssignment_1
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getMenuEntryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); }
+		ruleTRANSLATABLEID
+		{ after(grammarAccess.getMenuEntryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__HasDialogAssignment_6_3_0
+rule__MenuEntry__HasIconAssignment_2_0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); }
+		{ before(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); }
-			'dialog'
-			{ after(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); }
+			{ before(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); }
+			'icon'
+			{ after(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); }
+		{ after(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__DialogAssignment_6_3_1
+rule__MenuEntry__IconAssignment_2_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getDialogDialogCrossReference_6_3_1_0()); }
+		{ before(grammarAccess.getMenuEntryAccess().getIconSTRINGTerminalRuleCall_2_1_0()); }
+		RULE_STRING
+		{ after(grammarAccess.getMenuEntryAccess().getIconSTRINGTerminalRuleCall_2_1_0()); }
+	)
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MenuEntry__HasProcessAssignment_3_0_0
+	@init {
+		int stackSize = keepStackSize();
+	}
+:
+	(
+		{ before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getDialogDialogIDTerminalRuleCall_6_3_1_0_1()); }
-			RULE_ID
-			{ after(grammarAccess.getMenuEntryAccess().getDialogDialogIDTerminalRuleCall_6_3_1_0_1()); }
+			{ before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); }
+			'process'
+			{ after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getDialogDialogCrossReference_6_3_1_0()); }
+		{ after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__HasUserFilterAssignment_6_4
+rule__MenuEntry__ProcessAssignment_3_0_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); }
+		{ before(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_3_0_1_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); }
-			'userFilter'
-			{ after(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); }
+			{ before(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_3_0_1_0_1()); }
+			RULE_ID
+			{ after(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_3_0_1_0_1()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); }
+		{ after(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_3_0_1_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__HasKeyBindingAssignment_6_5
+rule__MenuEntry__HasPerspectiveAssignment_3_1_0
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); }
+		{ before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); }
 		(
-			{ before(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); }
-			'keyBinding'
-			{ after(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); }
+			{ before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); }
+			'perspective'
+			{ after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); }
 		)
-		{ after(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); }
+		{ after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); }
 	)
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MenuEntry__SubentriesAssignment_7_1
+rule__MenuEntry__PerspectiveAssignment_3_1_1
 	@init {
 		int stackSize = keepStackSize();
 	}
 :
 	(
-		{ before(grammarAccess.getMenuEntryAccess().getSubentriesMenuEntryParserRuleCall_7_1_0()); }
-		ruleMenuEntry
-		{ after(grammarAccess.getMenuEntryAccess().getSubentriesMenuEntryParserRuleCall_7_1_0()); }
+		{ before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_3_1_1_0()); }
+		(
+			{ before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_3_1_1_0_1()); }
+			RULE_ID
+			{ after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_3_1_1_0_1()); }
+		)
+		{ after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_3_1_1_0()); }
 	)
 ;
 finally {
diff --git a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.tokens b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.tokens
index 3e8cdd6..b4a92cb 100644
--- a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.tokens
+++ b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDsl.tokens
@@ -1,20 +1,20 @@
 '!'=40
 '!='=22
 '!=='=24
-'#'=65
+'#'=67
 '%'=39
 '%='=20
 '&&'=15
-'&'=88
-'('=61
-')'=62
+'&'=90
+'('=63
+')'=64
 '*'=36
 '**'=37
 '*='=18
 '+'=34
 '++'=41
 '+='=16
-','=63
+','=65
 '-'=35
 '--'=42
 '-='=17
@@ -24,9 +24,9 @@
 '..<'=29
 '/'=38
 '/='=19
-':'=72
-'::'=101
-';'=59
+':'=74
+'::'=103
+';'=61
 '<'=27
 '<>'=32
 '='=13
@@ -35,62 +35,64 @@
 '=>'=31
 '>'=26
 '>='=25
-'?'=87
-'?.'=102
+'?'=89
+'?.'=104
 '?:'=33
-'@'=60
-'['=66
-']'=64
-'accordionSubmenu'=89
-'as'=68
-'case'=74
-'catch'=86
-'collapsedImage'=54
-'default'=73
-'describedBy'=91
-'designer'=90
-'dialog'=97
-'do'=77
-'else'=70
-'entry'=58
-'expandedImage'=53
+'@'=62
+'['=68
+']'=66
+'as'=70
+'case'=76
+'catch'=88
+'category'=56
+'collapsedImage'=53
+'default'=75
+'designer'=91
+'dialog'=93
+'do'=79
+'else'=72
+'entry'=60
+'expandedImage'=52
 'extends'=45
 'extension'=48
 'false'=50
-'finally'=84
-'for'=75
-'height'=56
-'if'=69
-'image'=92
+'finally'=86
+'for'=77
+'height'=54
+'icon'=99
+'if'=71
 'import'=47
-'instanceof'=67
-'keyBinding'=99
-'new'=78
-'ns'=100
-'null'=79
+'instanceof'=69
+'keyBinding'=96
+'new'=80
+'ns'=102
+'null'=81
 'package'=51
-'perspective'=95
-'process'=94
-'return'=82
-'showBadge'=93
+'perspective'=101
+'process'=100
+'reportPrinter'=95
+'return'=84
 'static'=46
 'super'=49
-'switch'=71
-'synchronized'=85
-'table'=96
-'throw'=81
-'true'=105
-'try'=83
-'typeof'=80
-'userFilter'=98
+'switch'=73
+'synchronized'=87
+'systemSettings'=97
+'table'=92
+'throw'=83
+'tooltip'=98
+'tree'=59
+'true'=107
+'try'=85
+'typeof'=82
+'userFilter'=94
 'val'=44
-'var'=104
-'while'=76
-'width'=57
-'{'=52
-'|'=103
+'var'=106
+'while'=78
+'width'=55
+'{'=57
+'|'=105
 '||'=14
-'}'=55
+'}'=58
 RULE_ANY_OTHER=12
 RULE_DECIMAL=8
 RULE_HEX=6
@@ -106,6 +108,8 @@ T__102=102
 T__103=103
 T__104=104
 T__105=105
+T__106=106
+T__107=107
 T__13=13
 T__14=14
 T__15=15
diff --git a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslLexer.java b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslLexer.java
index 8e6ff05..672f357 100644
--- a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslLexer.java
+++ b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslLexer.java
@@ -108,11 +108,13 @@ public class InternalMenuDslLexer extends Lexer {
     public static final int RULE_ANY_OTHER=12;
     public static final int T__88=88;
     public static final int T__89=89;
+    public static final int T__107=107;
     public static final int T__84=84;
     public static final int T__104=104;
     public static final int T__85=85;
     public static final int T__103=103;
     public static final int T__86=86;
+    public static final int T__106=106;
     public static final int T__87=87;
     public static final int T__105=105;
 
@@ -943,10 +945,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:50:7: ( '{' )
-            // InternalMenuDsl.g:50:9: '{'
+            // InternalMenuDsl.g:50:7: ( 'expandedImage' )
+            // InternalMenuDsl.g:50:9: 'expandedImage'
             {
-            match('{'); 
+            match("expandedImage"); 
+
 
             }
 
@@ -963,10 +966,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:51:7: ( 'expandedImage' )
-            // InternalMenuDsl.g:51:9: 'expandedImage'
+            // InternalMenuDsl.g:51:7: ( 'collapsedImage' )
+            // InternalMenuDsl.g:51:9: 'collapsedImage'
             {
-            match("expandedImage"); 
+            match("collapsedImage"); 
 
 
             }
@@ -984,10 +987,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:52:7: ( 'collapsedImage' )
-            // InternalMenuDsl.g:52:9: 'collapsedImage'
+            // InternalMenuDsl.g:52:7: ( 'height' )
+            // InternalMenuDsl.g:52:9: 'height'
             {
-            match("collapsedImage"); 
+            match("height"); 
 
 
             }
@@ -1005,10 +1008,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:53:7: ( '}' )
-            // InternalMenuDsl.g:53:9: '}'
+            // InternalMenuDsl.g:53:7: ( 'width' )
+            // InternalMenuDsl.g:53:9: 'width'
             {
-            match('}'); 
+            match("width"); 
+
 
             }
 
@@ -1025,10 +1029,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:54:7: ( 'height' )
-            // InternalMenuDsl.g:54:9: 'height'
+            // InternalMenuDsl.g:54:7: ( 'category' )
+            // InternalMenuDsl.g:54:9: 'category'
             {
-            match("height"); 
+            match("category"); 
 
 
             }
@@ -1046,11 +1050,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:55:7: ( 'width' )
-            // InternalMenuDsl.g:55:9: 'width'
+            // InternalMenuDsl.g:55:7: ( '{' )
+            // InternalMenuDsl.g:55:9: '{'
             {
-            match("width"); 
-
+            match('{'); 
 
             }
 
@@ -1067,11 +1070,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:56:7: ( 'entry' )
-            // InternalMenuDsl.g:56:9: 'entry'
+            // InternalMenuDsl.g:56:7: ( '}' )
+            // InternalMenuDsl.g:56:9: '}'
             {
-            match("entry"); 
-
+            match('}'); 
 
             }
 
@@ -1088,10 +1090,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:57:7: ( ';' )
-            // InternalMenuDsl.g:57:9: ';'
+            // InternalMenuDsl.g:57:7: ( 'tree' )
+            // InternalMenuDsl.g:57:9: 'tree'
             {
-            match(';'); 
+            match("tree"); 
+
 
             }
 
@@ -1108,10 +1111,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:58:7: ( '@' )
-            // InternalMenuDsl.g:58:9: '@'
+            // InternalMenuDsl.g:58:7: ( 'entry' )
+            // InternalMenuDsl.g:58:9: 'entry'
             {
-            match('@'); 
+            match("entry"); 
+
 
             }
 
@@ -1128,10 +1132,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:59:7: ( '(' )
-            // InternalMenuDsl.g:59:9: '('
+            // InternalMenuDsl.g:59:7: ( ';' )
+            // InternalMenuDsl.g:59:9: ';'
             {
-            match('('); 
+            match(';'); 
 
             }
 
@@ -1148,10 +1152,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:60:7: ( ')' )
-            // InternalMenuDsl.g:60:9: ')'
+            // InternalMenuDsl.g:60:7: ( '@' )
+            // InternalMenuDsl.g:60:9: '@'
             {
-            match(')'); 
+            match('@'); 
 
             }
 
@@ -1168,10 +1172,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:61:7: ( ',' )
-            // InternalMenuDsl.g:61:9: ','
+            // InternalMenuDsl.g:61:7: ( '(' )
+            // InternalMenuDsl.g:61:9: '('
             {
-            match(','); 
+            match('('); 
 
             }
 
@@ -1188,10 +1192,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:62:7: ( ']' )
-            // InternalMenuDsl.g:62:9: ']'
+            // InternalMenuDsl.g:62:7: ( ')' )
+            // InternalMenuDsl.g:62:9: ')'
             {
-            match(']'); 
+            match(')'); 
 
             }
 
@@ -1208,10 +1212,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:63:7: ( '#' )
-            // InternalMenuDsl.g:63:9: '#'
+            // InternalMenuDsl.g:63:7: ( ',' )
+            // InternalMenuDsl.g:63:9: ','
             {
-            match('#'); 
+            match(','); 
 
             }
 
@@ -1228,10 +1232,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:64:7: ( '[' )
-            // InternalMenuDsl.g:64:9: '['
+            // InternalMenuDsl.g:64:7: ( ']' )
+            // InternalMenuDsl.g:64:9: ']'
             {
-            match('['); 
+            match(']'); 
 
             }
 
@@ -1248,11 +1252,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:65:7: ( 'instanceof' )
-            // InternalMenuDsl.g:65:9: 'instanceof'
+            // InternalMenuDsl.g:65:7: ( '#' )
+            // InternalMenuDsl.g:65:9: '#'
             {
-            match("instanceof"); 
-
+            match('#'); 
 
             }
 
@@ -1269,11 +1272,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:66:7: ( 'as' )
-            // InternalMenuDsl.g:66:9: 'as'
+            // InternalMenuDsl.g:66:7: ( '[' )
+            // InternalMenuDsl.g:66:9: '['
             {
-            match("as"); 
-
+            match('['); 
 
             }
 
@@ -1290,10 +1292,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:67:7: ( 'if' )
-            // InternalMenuDsl.g:67:9: 'if'
+            // InternalMenuDsl.g:67:7: ( 'instanceof' )
+            // InternalMenuDsl.g:67:9: 'instanceof'
             {
-            match("if"); 
+            match("instanceof"); 
 
 
             }
@@ -1311,10 +1313,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:68:7: ( 'else' )
-            // InternalMenuDsl.g:68:9: 'else'
+            // InternalMenuDsl.g:68:7: ( 'as' )
+            // InternalMenuDsl.g:68:9: 'as'
             {
-            match("else"); 
+            match("as"); 
 
 
             }
@@ -1332,10 +1334,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:69:7: ( 'switch' )
-            // InternalMenuDsl.g:69:9: 'switch'
+            // InternalMenuDsl.g:69:7: ( 'if' )
+            // InternalMenuDsl.g:69:9: 'if'
             {
-            match("switch"); 
+            match("if"); 
 
 
             }
@@ -1353,10 +1355,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:70:7: ( ':' )
-            // InternalMenuDsl.g:70:9: ':'
+            // InternalMenuDsl.g:70:7: ( 'else' )
+            // InternalMenuDsl.g:70:9: 'else'
             {
-            match(':'); 
+            match("else"); 
+
 
             }
 
@@ -1373,10 +1376,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:71:7: ( 'default' )
-            // InternalMenuDsl.g:71:9: 'default'
+            // InternalMenuDsl.g:71:7: ( 'switch' )
+            // InternalMenuDsl.g:71:9: 'switch'
             {
-            match("default"); 
+            match("switch"); 
 
 
             }
@@ -1394,11 +1397,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:72:7: ( 'case' )
-            // InternalMenuDsl.g:72:9: 'case'
+            // InternalMenuDsl.g:72:7: ( ':' )
+            // InternalMenuDsl.g:72:9: ':'
             {
-            match("case"); 
-
+            match(':'); 
 
             }
 
@@ -1415,10 +1417,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:73:7: ( 'for' )
-            // InternalMenuDsl.g:73:9: 'for'
+            // InternalMenuDsl.g:73:7: ( 'default' )
+            // InternalMenuDsl.g:73:9: 'default'
             {
-            match("for"); 
+            match("default"); 
 
 
             }
@@ -1436,10 +1438,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:74:7: ( 'while' )
-            // InternalMenuDsl.g:74:9: 'while'
+            // InternalMenuDsl.g:74:7: ( 'case' )
+            // InternalMenuDsl.g:74:9: 'case'
             {
-            match("while"); 
+            match("case"); 
 
 
             }
@@ -1457,10 +1459,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:75:7: ( 'do' )
-            // InternalMenuDsl.g:75:9: 'do'
+            // InternalMenuDsl.g:75:7: ( 'for' )
+            // InternalMenuDsl.g:75:9: 'for'
             {
-            match("do"); 
+            match("for"); 
 
 
             }
@@ -1478,10 +1480,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:76:7: ( 'new' )
-            // InternalMenuDsl.g:76:9: 'new'
+            // InternalMenuDsl.g:76:7: ( 'while' )
+            // InternalMenuDsl.g:76:9: 'while'
             {
-            match("new"); 
+            match("while"); 
 
 
             }
@@ -1499,10 +1501,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:77:7: ( 'null' )
-            // InternalMenuDsl.g:77:9: 'null'
+            // InternalMenuDsl.g:77:7: ( 'do' )
+            // InternalMenuDsl.g:77:9: 'do'
             {
-            match("null"); 
+            match("do"); 
 
 
             }
@@ -1520,10 +1522,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:78:7: ( 'typeof' )
-            // InternalMenuDsl.g:78:9: 'typeof'
+            // InternalMenuDsl.g:78:7: ( 'new' )
+            // InternalMenuDsl.g:78:9: 'new'
             {
-            match("typeof"); 
+            match("new"); 
 
 
             }
@@ -1541,10 +1543,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:79:7: ( 'throw' )
-            // InternalMenuDsl.g:79:9: 'throw'
+            // InternalMenuDsl.g:79:7: ( 'null' )
+            // InternalMenuDsl.g:79:9: 'null'
             {
-            match("throw"); 
+            match("null"); 
 
 
             }
@@ -1562,10 +1564,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:80:7: ( 'return' )
-            // InternalMenuDsl.g:80:9: 'return'
+            // InternalMenuDsl.g:80:7: ( 'typeof' )
+            // InternalMenuDsl.g:80:9: 'typeof'
             {
-            match("return"); 
+            match("typeof"); 
 
 
             }
@@ -1583,10 +1585,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:81:7: ( 'try' )
-            // InternalMenuDsl.g:81:9: 'try'
+            // InternalMenuDsl.g:81:7: ( 'throw' )
+            // InternalMenuDsl.g:81:9: 'throw'
             {
-            match("try"); 
+            match("throw"); 
 
 
             }
@@ -1604,10 +1606,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:82:7: ( 'finally' )
-            // InternalMenuDsl.g:82:9: 'finally'
+            // InternalMenuDsl.g:82:7: ( 'return' )
+            // InternalMenuDsl.g:82:9: 'return'
             {
-            match("finally"); 
+            match("return"); 
 
 
             }
@@ -1625,10 +1627,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:83:7: ( 'synchronized' )
-            // InternalMenuDsl.g:83:9: 'synchronized'
+            // InternalMenuDsl.g:83:7: ( 'try' )
+            // InternalMenuDsl.g:83:9: 'try'
             {
-            match("synchronized"); 
+            match("try"); 
 
 
             }
@@ -1646,10 +1648,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:84:7: ( 'catch' )
-            // InternalMenuDsl.g:84:9: 'catch'
+            // InternalMenuDsl.g:84:7: ( 'finally' )
+            // InternalMenuDsl.g:84:9: 'finally'
             {
-            match("catch"); 
+            match("finally"); 
 
 
             }
@@ -1667,10 +1669,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:85:7: ( '?' )
-            // InternalMenuDsl.g:85:9: '?'
+            // InternalMenuDsl.g:85:7: ( 'synchronized' )
+            // InternalMenuDsl.g:85:9: 'synchronized'
             {
-            match('?'); 
+            match("synchronized"); 
+
 
             }
 
@@ -1687,10 +1690,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:86:7: ( '&' )
-            // InternalMenuDsl.g:86:9: '&'
+            // InternalMenuDsl.g:86:7: ( 'catch' )
+            // InternalMenuDsl.g:86:9: 'catch'
             {
-            match('&'); 
+            match("catch"); 
+
 
             }
 
@@ -1707,11 +1711,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:87:7: ( 'accordionSubmenu' )
-            // InternalMenuDsl.g:87:9: 'accordionSubmenu'
+            // InternalMenuDsl.g:87:7: ( '?' )
+            // InternalMenuDsl.g:87:9: '?'
             {
-            match("accordionSubmenu"); 
-
+            match('?'); 
 
             }
 
@@ -1728,11 +1731,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:88:7: ( 'designer' )
-            // InternalMenuDsl.g:88:9: 'designer'
+            // InternalMenuDsl.g:88:7: ( '&' )
+            // InternalMenuDsl.g:88:9: '&'
             {
-            match("designer"); 
-
+            match('&'); 
 
             }
 
@@ -1749,10 +1751,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:89:7: ( 'describedBy' )
-            // InternalMenuDsl.g:89:9: 'describedBy'
+            // InternalMenuDsl.g:89:7: ( 'designer' )
+            // InternalMenuDsl.g:89:9: 'designer'
             {
-            match("describedBy"); 
+            match("designer"); 
 
 
             }
@@ -1770,10 +1772,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:90:7: ( 'image' )
-            // InternalMenuDsl.g:90:9: 'image'
+            // InternalMenuDsl.g:90:7: ( 'table' )
+            // InternalMenuDsl.g:90:9: 'table'
             {
-            match("image"); 
+            match("table"); 
 
 
             }
@@ -1791,10 +1793,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:91:7: ( 'showBadge' )
-            // InternalMenuDsl.g:91:9: 'showBadge'
+            // InternalMenuDsl.g:91:7: ( 'dialog' )
+            // InternalMenuDsl.g:91:9: 'dialog'
             {
-            match("showBadge"); 
+            match("dialog"); 
 
 
             }
@@ -1812,10 +1814,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:92:7: ( 'process' )
-            // InternalMenuDsl.g:92:9: 'process'
+            // InternalMenuDsl.g:92:7: ( 'userFilter' )
+            // InternalMenuDsl.g:92:9: 'userFilter'
             {
-            match("process"); 
+            match("userFilter"); 
 
 
             }
@@ -1833,10 +1835,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:93:7: ( 'perspective' )
-            // InternalMenuDsl.g:93:9: 'perspective'
+            // InternalMenuDsl.g:93:7: ( 'reportPrinter' )
+            // InternalMenuDsl.g:93:9: 'reportPrinter'
             {
-            match("perspective"); 
+            match("reportPrinter"); 
 
 
             }
@@ -1854,10 +1856,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:94:7: ( 'table' )
-            // InternalMenuDsl.g:94:9: 'table'
+            // InternalMenuDsl.g:94:7: ( 'keyBinding' )
+            // InternalMenuDsl.g:94:9: 'keyBinding'
             {
-            match("table"); 
+            match("keyBinding"); 
 
 
             }
@@ -1875,10 +1877,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:95:7: ( 'dialog' )
-            // InternalMenuDsl.g:95:9: 'dialog'
+            // InternalMenuDsl.g:95:7: ( 'systemSettings' )
+            // InternalMenuDsl.g:95:9: 'systemSettings'
             {
-            match("dialog"); 
+            match("systemSettings"); 
 
 
             }
@@ -1896,10 +1898,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:96:7: ( 'userFilter' )
-            // InternalMenuDsl.g:96:9: 'userFilter'
+            // InternalMenuDsl.g:96:7: ( 'tooltip' )
+            // InternalMenuDsl.g:96:9: 'tooltip'
             {
-            match("userFilter"); 
+            match("tooltip"); 
 
 
             }
@@ -1917,10 +1919,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:97:7: ( 'keyBinding' )
-            // InternalMenuDsl.g:97:9: 'keyBinding'
+            // InternalMenuDsl.g:97:7: ( 'icon' )
+            // InternalMenuDsl.g:97:9: 'icon'
             {
-            match("keyBinding"); 
+            match("icon"); 
 
 
             }
@@ -1938,10 +1940,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:98:8: ( 'ns' )
-            // InternalMenuDsl.g:98:10: 'ns'
+            // InternalMenuDsl.g:98:8: ( 'process' )
+            // InternalMenuDsl.g:98:10: 'process'
             {
-            match("ns"); 
+            match("process"); 
 
 
             }
@@ -1959,10 +1961,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:99:8: ( '::' )
-            // InternalMenuDsl.g:99:10: '::'
+            // InternalMenuDsl.g:99:8: ( 'perspective' )
+            // InternalMenuDsl.g:99:10: 'perspective'
             {
-            match("::"); 
+            match("perspective"); 
 
 
             }
@@ -1980,10 +1982,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:100:8: ( '?.' )
-            // InternalMenuDsl.g:100:10: '?.'
+            // InternalMenuDsl.g:100:8: ( 'ns' )
+            // InternalMenuDsl.g:100:10: 'ns'
             {
-            match("?."); 
+            match("ns"); 
 
 
             }
@@ -2001,10 +2003,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:101:8: ( '|' )
-            // InternalMenuDsl.g:101:10: '|'
+            // InternalMenuDsl.g:101:8: ( '::' )
+            // InternalMenuDsl.g:101:10: '::'
             {
-            match('|'); 
+            match("::"); 
+
 
             }
 
@@ -2021,10 +2024,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:102:8: ( 'var' )
-            // InternalMenuDsl.g:102:10: 'var'
+            // InternalMenuDsl.g:102:8: ( '?.' )
+            // InternalMenuDsl.g:102:10: '?.'
             {
-            match("var"); 
+            match("?."); 
 
 
             }
@@ -2042,8 +2045,49 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:103:8: ( 'true' )
-            // InternalMenuDsl.g:103:10: 'true'
+            // InternalMenuDsl.g:103:8: ( '|' )
+            // InternalMenuDsl.g:103:10: '|'
+            {
+            match('|'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__105"
+
+    // $ANTLR start "T__106"
+    public final void mT__106() throws RecognitionException {
+        try {
+            int _type = T__106;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalMenuDsl.g:104:8: ( 'var' )
+            // InternalMenuDsl.g:104:10: 'var'
+            {
+            match("var"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__106"
+
+    // $ANTLR start "T__107"
+    public final void mT__107() throws RecognitionException {
+        try {
+            int _type = T__107;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalMenuDsl.g:105:8: ( 'true' )
+            // InternalMenuDsl.g:105:10: 'true'
             {
             match("true"); 
 
@@ -2056,17 +2100,17 @@ public class InternalMenuDslLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__105"
+    // $ANTLR end "T__107"
 
     // $ANTLR start "RULE_HEX"
     public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20468:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // InternalMenuDsl.g:20468:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalMenuDsl.g:20644:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalMenuDsl.g:20644:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // InternalMenuDsl.g:20468:12: ( '0x' | '0X' )
+            // InternalMenuDsl.g:20644:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2094,7 +2138,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // InternalMenuDsl.g:20468:13: '0x'
+                    // InternalMenuDsl.g:20644:13: '0x'
                     {
                     match("0x"); 
 
@@ -2102,7 +2146,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:20468:18: '0X'
+                    // InternalMenuDsl.g:20644:18: '0X'
                     {
                     match("0X"); 
 
@@ -2112,7 +2156,7 @@ public class InternalMenuDslLexer extends Lexer {
 
             }
 
-            // InternalMenuDsl.g:20468:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalMenuDsl.g:20644:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -2150,7 +2194,7 @@ public class InternalMenuDslLexer extends Lexer {
                 cnt2++;
             } while (true);
 
-            // InternalMenuDsl.g:20468:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalMenuDsl.g:20644:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2159,10 +2203,10 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalMenuDsl.g:20468:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalMenuDsl.g:20644:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // InternalMenuDsl.g:20468:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalMenuDsl.g:20644:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -2180,7 +2224,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt3) {
                         case 1 :
-                            // InternalMenuDsl.g:20468:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalMenuDsl.g:20644:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2204,7 +2248,7 @@ public class InternalMenuDslLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:20468:84: ( 'l' | 'L' )
+                            // InternalMenuDsl.g:20644:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2243,11 +2287,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20470:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // InternalMenuDsl.g:20470:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalMenuDsl.g:20646:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalMenuDsl.g:20646:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // InternalMenuDsl.g:20470:21: ( '0' .. '9' | '_' )*
+            // InternalMenuDsl.g:20646:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -2296,11 +2340,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20472:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // InternalMenuDsl.g:20472:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalMenuDsl.g:20648:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalMenuDsl.g:20648:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // InternalMenuDsl.g:20472:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalMenuDsl.g:20648:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2309,7 +2353,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt7) {
                 case 1 :
-                    // InternalMenuDsl.g:20472:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalMenuDsl.g:20648:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2320,7 +2364,7 @@ public class InternalMenuDslLexer extends Lexer {
                         recover(mse);
                         throw mse;}
 
-                    // InternalMenuDsl.g:20472:36: ( '+' | '-' )?
+                    // InternalMenuDsl.g:20648:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2353,7 +2397,7 @@ public class InternalMenuDslLexer extends Lexer {
 
             }
 
-            // InternalMenuDsl.g:20472:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalMenuDsl.g:20648:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2365,7 +2409,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // InternalMenuDsl.g:20472:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalMenuDsl.g:20648:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2389,7 +2433,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:20472:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalMenuDsl.g:20648: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();
@@ -2422,10 +2466,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20474:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // InternalMenuDsl.g:20474:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalMenuDsl.g:20650:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalMenuDsl.g:20650:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // InternalMenuDsl.g:20474:11: ( '^' )?
+            // InternalMenuDsl.g:20650:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2434,7 +2478,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalMenuDsl.g:20474:11: '^'
+                    // InternalMenuDsl.g:20650:11: '^'
                     {
                     match('^'); 
 
@@ -2452,7 +2496,7 @@ public class InternalMenuDslLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalMenuDsl.g:20474:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalMenuDsl.g:20650:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2501,10 +2545,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20476:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // InternalMenuDsl.g:20476:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalMenuDsl.g:20652:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalMenuDsl.g:20652:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // InternalMenuDsl.g:20476:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalMenuDsl.g:20652:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2522,10 +2566,10 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt15) {
                 case 1 :
-                    // InternalMenuDsl.g:20476:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalMenuDsl.g:20652:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // InternalMenuDsl.g:20476:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalMenuDsl.g:20652:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2541,7 +2585,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                         switch (alt11) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:20476:21: '\\\\' .
+                    	    // InternalMenuDsl.g:20652:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2549,7 +2593,7 @@ public class InternalMenuDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalMenuDsl.g:20476:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalMenuDsl.g:20652:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2569,7 +2613,7 @@ public class InternalMenuDslLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalMenuDsl.g:20476:44: ( '\"' )?
+                    // InternalMenuDsl.g:20652:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2578,7 +2622,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt12) {
                         case 1 :
-                            // InternalMenuDsl.g:20476:44: '\"'
+                            // InternalMenuDsl.g:20652:44: '\"'
                             {
                             match('\"'); 
 
@@ -2591,10 +2635,10 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:20476:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalMenuDsl.g:20652:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // InternalMenuDsl.g:20476:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalMenuDsl.g:20652:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2610,7 +2654,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                         switch (alt13) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:20476:55: '\\\\' .
+                    	    // InternalMenuDsl.g:20652:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2618,7 +2662,7 @@ public class InternalMenuDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalMenuDsl.g:20476:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalMenuDsl.g:20652:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2638,7 +2682,7 @@ public class InternalMenuDslLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalMenuDsl.g:20476:79: ( '\\'' )?
+                    // InternalMenuDsl.g:20652:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2647,7 +2691,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt14) {
                         case 1 :
-                            // InternalMenuDsl.g:20476:79: '\\''
+                            // InternalMenuDsl.g:20652:79: '\\''
                             {
                             match('\''); 
 
@@ -2678,12 +2722,12 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20478:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalMenuDsl.g:20478:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalMenuDsl.g:20654:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalMenuDsl.g:20654:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalMenuDsl.g:20478:24: ( options {greedy=false; } : . )*
+            // InternalMenuDsl.g:20654:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2708,7 +2752,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                 switch (alt16) {
             	case 1 :
-            	    // InternalMenuDsl.g:20478:52: .
+            	    // InternalMenuDsl.g:20654:52: .
             	    {
             	    matchAny(); 
 
@@ -2738,12 +2782,12 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20480:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalMenuDsl.g:20480:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalMenuDsl.g:20656:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalMenuDsl.g:20656:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalMenuDsl.g:20480:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalMenuDsl.g:20656:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2756,7 +2800,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                 switch (alt17) {
             	case 1 :
-            	    // InternalMenuDsl.g:20480:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalMenuDsl.g:20656: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();
@@ -2776,7 +2820,7 @@ public class InternalMenuDslLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalMenuDsl.g:20480:40: ( ( '\\r' )? '\\n' )?
+            // InternalMenuDsl.g:20656:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2785,9 +2829,9 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt19) {
                 case 1 :
-                    // InternalMenuDsl.g:20480:41: ( '\\r' )? '\\n'
+                    // InternalMenuDsl.g:20656:41: ( '\\r' )? '\\n'
                     {
-                    // InternalMenuDsl.g:20480:41: ( '\\r' )?
+                    // InternalMenuDsl.g:20656:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2796,7 +2840,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt18) {
                         case 1 :
-                            // InternalMenuDsl.g:20480:41: '\\r'
+                            // InternalMenuDsl.g:20656:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2828,10 +2872,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20482:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalMenuDsl.g:20482:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalMenuDsl.g:20658:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalMenuDsl.g:20658:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalMenuDsl.g:20482:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalMenuDsl.g:20658:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2885,8 +2929,8 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20484:16: ( . )
-            // InternalMenuDsl.g:20484:18: .
+            // InternalMenuDsl.g:20660:16: ( . )
+            // InternalMenuDsl.g:20660:18: .
             {
             matchAny(); 
 
@@ -2901,8 +2945,8 @@ public class InternalMenuDslLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalMenuDsl.g:1:8: ( T__13 | T__14 | 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 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt21=102;
+        // InternalMenuDsl.g:1:8: ( T__13 | T__14 | 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 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt21=104;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
@@ -3557,63 +3601,77 @@ public class InternalMenuDslLexer extends Lexer {
                 }
                 break;
             case 94 :
-                // InternalMenuDsl.g:1:574: RULE_HEX
+                // InternalMenuDsl.g:1:574: T__106
                 {
-                mRULE_HEX(); 
+                mT__106(); 
 
                 }
                 break;
             case 95 :
-                // InternalMenuDsl.g:1:583: RULE_INT
+                // InternalMenuDsl.g:1:581: T__107
                 {
-                mRULE_INT(); 
+                mT__107(); 
 
                 }
                 break;
             case 96 :
-                // InternalMenuDsl.g:1:592: RULE_DECIMAL
+                // InternalMenuDsl.g:1:588: RULE_HEX
                 {
-                mRULE_DECIMAL(); 
+                mRULE_HEX(); 
 
                 }
                 break;
             case 97 :
-                // InternalMenuDsl.g:1:605: RULE_ID
+                // InternalMenuDsl.g:1:597: RULE_INT
                 {
-                mRULE_ID(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 98 :
-                // InternalMenuDsl.g:1:613: RULE_STRING
+                // InternalMenuDsl.g:1:606: RULE_DECIMAL
                 {
-                mRULE_STRING(); 
+                mRULE_DECIMAL(); 
 
                 }
                 break;
             case 99 :
-                // InternalMenuDsl.g:1:625: RULE_ML_COMMENT
+                // InternalMenuDsl.g:1:619: RULE_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 100 :
-                // InternalMenuDsl.g:1:641: RULE_SL_COMMENT
+                // InternalMenuDsl.g:1:627: RULE_STRING
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 101 :
-                // InternalMenuDsl.g:1:657: RULE_WS
+                // InternalMenuDsl.g:1:639: RULE_ML_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 102 :
-                // InternalMenuDsl.g:1:665: RULE_ANY_OTHER
+                // InternalMenuDsl.g:1:655: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 103 :
+                // InternalMenuDsl.g:1:671: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 104 :
+                // InternalMenuDsl.g:1:679: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3627,19 +3685,19 @@ public class InternalMenuDslLexer extends Lexer {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\1\63\1\65\1\67\1\72\1\76\1\101\1\105\1\107\1\111\1\113\1\115\1\117\1\122\6\124\1\uffff\1\124\1\uffff\2\124\10\uffff\1\124\1\170\6\124\2\u0088\1\60\5\uffff\1\u008d\26\uffff\1\u008f\5\uffff\1\u0091\4\uffff\1\124\1\uffff\12\124\1\u00a0\6\124\1\uffff\2\124\1\uffff\3\124\10\uffff\1\u00ad\1\124\2\uffff\1\124\1\u00b1\3\124\1\u00b5\7\124\1\uffff\1\u0088\12\uffff\1\u00be\1\u00bf\14\124\1\uffff\1\124\1\u00cd\12\124\1\uffff\3\124\1\uffff\1\124\1\u00dd\1\124\1\uffff\2\124\1\u00e1\5\124\2\uffff\3\124\1\u00ea\11\124\1\uffff\5\124\1\u00f9\11\124\1\uffff\1\u0103\2\124\1\uffff\1\u0106\6\124\1\u010e\1\uffff\1\124\1\u0110\4\124\1\u0115\1\124\1\u0117\5\124\1\uffff\1\u011d\1\124\1\u011f\1\u0120\5\124\1\uffff\1\124\1\u0127\1\uffff\1\u0128\6\124\1\uffff\1\u012f\1\uffff\1\u0130\2\124\1\u0133\1\uffff\1\124\1\uffff\5\124\1\uffff\1\u013a\2\uffff\4\124\1\u013f\1\u0140\2\uffff\1\u0141\2\124\1\u0144\2\124\2\uffff\2\124\1\uffff\1\124\1\u014a\1\u014b\1\u014c\2\124\1\uffff\1\124\1\u0150\2\124\3\uffff\2\124\1\uffff\5\124\3\uffff\3\124\1\uffff\1\u015d\3\124\1\u0161\2\124\1\u0164\4\124\1\uffff\3\124\1\uffff\2\124\1\uffff\1\u016e\4\124\1\u0173\1\u0174\2\124\1\uffff\1\u0177\2\124\1\u017a\2\uffff\1\124\1\u017c\1\uffff\2\124\1\uffff\1\u017f\1\uffff\2\124\1\uffff\1\u0182\1\124\1\uffff\1\124\1\u0185\1\uffff";
+        "\1\uffff\1\63\1\65\1\67\1\72\1\76\1\101\1\105\1\107\1\111\1\113\1\115\1\117\1\122\11\124\2\uffff\1\124\10\uffff\1\124\1\174\5\124\2\u0088\1\60\5\uffff\1\u008d\26\uffff\1\u008f\5\uffff\1\u0091\4\uffff\1\124\1\uffff\11\124\1\u009f\14\124\2\uffff\5\124\10\uffff\1\u00b4\2\uffff\1\124\1\u00b7\3\124\1\u00bb\3\124\1\uffff\1\u0088\12\uffff\1\u00c0\1\u00c1\13\124\1\uffff\2\124\1\u00cf\13\124\1\u00dc\5\124\1\uffff\2\124\1\uffff\1\124\1\u00e5\1\124\1\uffff\4\124\2\uffff\3\124\1\u00ee\7\124\1\u00f6\1\124\1\uffff\7\124\1\u00ff\3\124\1\u0103\1\uffff\1\u0104\7\124\1\uffff\1\u010c\6\124\1\u0114\1\uffff\1\124\1\u0116\5\124\1\uffff\1\u011c\6\124\1\u0123\1\uffff\1\124\1\u0125\1\u0126\2\uffff\1\124\1\u0128\1\u0129\4\124\1\uffff\7\124\1\uffff\1\u0135\1\uffff\1\u0136\2\124\1\u0139\1\124\1\uffff\6\124\1\uffff\1\u0141\2\uffff\1\u0142\2\uffff\3\124\1\u0146\1\u0147\3\124\1\u014b\2\124\2\uffff\2\124\1\uffff\1\124\1\u0151\1\u0152\1\u0153\3\124\2\uffff\1\u0157\1\u0158\1\124\2\uffff\3\124\1\uffff\5\124\3\uffff\2\124\1\u0164\2\uffff\1\u0165\3\124\1\u0169\6\124\2\uffff\3\124\1\uffff\3\124\1\u0176\3\124\1\u017a\1\u017b\3\124\1\uffff\1\u017f\2\124\2\uffff\1\124\1\u0183\1\124\1\uffff\2\124\1\u0187\1\uffff\2\124\1\u018a\1\uffff\1\u018b\1\u018c\3\uffff";
     static final String DFA21_eofS =
-        "\u0186\uffff";
+        "\u018d\uffff";
     static final String DFA21_minS =
-        "\1\0\1\75\1\174\1\46\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\154\1\150\1\146\2\141\1\uffff\1\141\1\uffff\1\145\1\150\10\uffff\1\143\1\72\2\145\1\141\1\145\1\163\1\145\2\60\1\44\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\154\1\uffff\1\160\1\164\1\163\1\141\1\160\1\151\1\156\1\157\1\141\1\163\1\44\1\154\1\162\1\156\1\143\1\157\1\162\1\uffff\1\154\1\163\1\uffff\1\151\1\144\1\151\10\uffff\1\44\1\143\2\uffff\1\146\1\44\1\141\1\167\1\154\1\44\1\160\1\162\1\165\1\142\1\164\1\145\1\171\1\uffff\1\60\12\uffff\2\44\1\145\1\141\1\162\1\145\1\164\1\145\1\164\1\143\1\167\1\157\1\147\1\164\1\uffff\1\163\1\44\1\141\1\153\1\143\1\163\1\154\1\145\1\143\1\147\1\164\1\154\1\uffff\1\157\1\141\1\143\1\uffff\1\154\1\44\1\154\1\uffff\1\145\1\157\1\44\1\145\1\154\1\165\1\162\1\102\2\uffff\2\156\1\171\1\44\1\151\1\162\1\143\1\150\1\102\1\162\1\145\1\141\1\145\1\uffff\1\154\1\141\1\145\1\160\1\141\1\44\3\150\1\145\1\162\1\165\1\147\1\162\1\157\1\uffff\1\44\1\157\1\167\1\uffff\1\44\1\145\1\162\1\106\1\151\2\144\1\44\1\uffff\1\143\1\44\1\150\1\162\1\141\1\164\1\44\1\156\1\44\1\154\1\147\1\163\1\145\1\160\1\uffff\1\44\1\164\2\44\1\144\1\154\1\156\1\151\1\147\1\uffff\1\146\1\44\1\uffff\1\44\1\156\1\151\1\156\1\163\1\151\1\145\1\uffff\1\44\1\uffff\1\44\1\157\1\144\1\44\1\uffff\1\143\1\uffff\1\171\1\145\1\163\1\143\1\163\1\uffff\1\44\2\uffff\1\151\1\164\1\145\1\142\2\44\2\uffff\1\44\1\154\1\144\1\44\1\157\1\144\2\uffff\1\156\1\147\1\uffff\1\145\3\44\1\164\1\145\1\uffff\1\157\1\44\1\162\1\145\3\uffff\1\164\1\151\1\uffff\1\156\1\111\1\151\1\145\1\157\3\uffff\1\151\1\144\1\156\1\uffff\1\44\1\144\1\145\1\156\1\44\1\155\1\172\1\44\1\146\1\166\1\111\1\123\1\uffff\1\102\1\162\1\147\1\uffff\1\141\1\145\1\uffff\1\44\1\145\1\155\1\165\1\171\2\44\1\147\1\144\1\uffff\1\44\1\141\1\142\1\44\2\uffff\1\145\1\44\1\uffff\1\147\1\155\1\uffff\1\44\1\uffff\2\145\1\uffff\1\44\1\156\1\uffff\1\165\1\44\1\uffff";
+        "\1\0\1\75\1\174\1\46\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\154\1\164\1\143\3\141\1\145\1\150\2\uffff\1\141\10\uffff\1\163\1\72\3\145\1\163\1\145\2\60\1\44\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\154\1\uffff\1\160\1\164\1\163\1\141\1\160\1\151\1\156\1\160\1\163\1\44\1\157\1\154\1\162\1\156\1\143\1\157\1\162\1\154\1\163\1\151\1\144\1\151\2\uffff\1\145\1\160\1\162\1\142\1\157\10\uffff\1\44\2\uffff\1\146\1\44\1\141\1\167\1\154\1\44\1\160\1\145\1\171\1\uffff\1\60\12\uffff\2\44\1\145\1\141\1\162\1\145\1\164\1\145\1\164\1\143\1\164\1\157\1\164\1\uffff\1\156\1\163\1\44\1\141\1\153\1\143\1\163\1\154\1\143\1\145\1\147\1\164\1\154\1\145\1\44\2\145\1\157\2\154\1\uffff\1\141\1\151\1\uffff\1\154\1\44\1\154\1\uffff\1\165\1\157\1\162\1\102\2\uffff\2\156\1\171\1\44\1\151\1\162\1\143\1\150\1\145\1\162\1\141\1\44\1\145\1\uffff\1\154\1\141\1\145\1\160\1\141\1\147\1\150\1\44\2\150\1\145\1\44\1\uffff\1\44\1\157\1\167\1\145\1\164\1\165\1\147\1\157\1\uffff\1\44\2\162\1\106\1\151\2\144\1\44\1\uffff\1\143\1\44\1\150\1\162\1\155\1\164\1\156\1\uffff\1\44\1\154\1\147\1\163\1\145\1\160\1\157\1\44\1\uffff\1\164\2\44\2\uffff\1\146\2\44\1\151\1\154\1\156\1\147\1\uffff\1\156\1\164\1\151\1\156\1\163\1\151\1\145\1\uffff\1\44\1\uffff\1\44\1\157\1\123\1\44\1\143\1\uffff\1\171\1\145\1\163\1\143\1\163\1\162\1\uffff\1\44\2\uffff\1\44\2\uffff\1\160\1\164\1\145\2\44\1\120\1\154\1\144\1\44\1\157\1\144\2\uffff\1\156\1\145\1\uffff\1\145\3\44\1\164\1\145\1\171\2\uffff\2\44\1\162\2\uffff\1\162\1\164\1\151\1\uffff\1\156\1\111\1\151\1\164\1\157\3\uffff\1\151\1\144\1\44\2\uffff\1\44\1\151\1\145\1\156\1\44\1\155\1\172\1\164\1\146\1\166\1\111\2\uffff\1\156\1\162\1\147\1\uffff\1\141\1\145\1\151\1\44\1\145\1\155\1\164\2\44\1\147\1\144\1\156\1\uffff\1\44\1\141\1\145\2\uffff\1\145\1\44\1\147\1\uffff\1\147\1\162\1\44\1\uffff\1\163\1\145\1\44\1\uffff\2\44\3\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\76\1\174\1\46\1\75\1\76\5\75\1\76\1\56\1\72\1\141\1\170\1\171\1\156\1\157\1\162\1\uffff\1\157\1\uffff\1\145\1\151\10\uffff\1\163\1\72\1\157\1\165\1\171\1\145\1\163\1\145\1\170\1\154\1\172\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\162\1\uffff\2\164\1\163\1\141\1\160\1\151\1\156\1\157\1\160\1\163\1\172\1\154\1\162\1\156\1\143\1\157\1\162\1\uffff\1\154\1\164\1\uffff\1\151\1\144\1\151\10\uffff\1\172\1\143\2\uffff\1\163\1\172\1\141\1\167\1\154\1\172\1\160\1\162\1\171\1\142\1\164\1\145\1\171\1\uffff\1\154\12\uffff\2\172\1\145\1\141\1\162\1\145\1\164\1\145\1\164\1\143\1\167\1\157\1\147\1\164\1\uffff\1\163\1\172\1\141\1\153\1\143\1\163\1\154\1\145\1\143\1\147\1\164\1\154\1\uffff\1\157\1\141\1\151\1\uffff\1\154\1\172\1\154\1\uffff\1\145\1\157\1\172\1\145\1\154\1\165\1\162\1\102\2\uffff\2\156\1\171\1\172\1\151\1\162\1\143\1\150\1\102\1\162\1\145\1\141\1\145\1\uffff\1\154\1\141\1\145\1\160\1\141\1\172\3\150\1\145\1\162\1\165\1\147\1\162\1\157\1\uffff\1\172\1\157\1\167\1\uffff\1\172\1\145\1\162\1\106\1\151\1\163\1\144\1\172\1\uffff\1\143\1\172\1\150\1\162\1\141\1\164\1\172\1\156\1\172\1\154\1\147\1\163\1\145\1\160\1\uffff\1\172\1\164\2\172\1\144\1\154\1\156\1\151\1\147\1\uffff\1\146\1\172\1\uffff\1\172\1\156\1\151\1\156\1\163\1\151\1\145\1\uffff\1\172\1\uffff\1\172\1\157\1\144\1\172\1\uffff\1\143\1\uffff\1\171\1\145\1\163\1\143\1\163\1\uffff\1\172\2\uffff\1\151\1\164\1\145\1\142\2\172\2\uffff\1\172\1\154\1\144\1\172\1\157\1\144\2\uffff\1\156\1\147\1\uffff\1\145\3\172\1\164\1\145\1\uffff\1\157\1\172\1\162\1\145\3\uffff\1\164\1\151\1\uffff\1\156\1\111\1\151\1\145\1\157\3\uffff\1\151\1\144\1\156\1\uffff\1\172\1\144\1\145\1\156\1\172\1\155\2\172\1\146\1\166\1\111\1\123\1\uffff\1\102\1\162\1\147\1\uffff\1\141\1\145\1\uffff\1\172\1\145\1\155\1\165\1\171\2\172\1\147\1\144\1\uffff\1\172\1\141\1\142\1\172\2\uffff\1\145\1\172\1\uffff\1\147\1\155\1\uffff\1\172\1\uffff\2\145\1\uffff\1\172\1\156\1\uffff\1\165\1\172\1\uffff";
+        "\1\uffff\1\76\1\174\1\46\1\75\1\76\5\75\1\76\1\56\1\72\1\141\1\170\1\171\1\156\1\157\1\162\1\157\1\145\1\151\2\uffff\1\171\10\uffff\1\163\1\72\1\157\1\165\1\145\1\163\1\145\1\170\1\154\1\172\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\162\1\uffff\2\164\1\163\1\141\1\160\1\151\1\163\1\160\1\163\1\172\1\157\1\154\1\162\1\156\1\143\1\157\1\162\1\154\1\164\1\151\1\144\1\151\2\uffff\1\171\1\160\1\162\1\142\1\157\10\uffff\1\172\2\uffff\1\163\1\172\1\141\1\167\1\154\1\172\1\164\1\145\1\171\1\uffff\1\154\12\uffff\2\172\1\145\1\141\1\162\1\145\1\164\1\145\1\164\1\143\1\164\1\157\1\164\1\uffff\1\156\1\163\1\172\1\141\1\153\1\143\1\163\1\154\2\145\1\147\1\164\1\154\1\145\1\172\2\145\1\157\2\154\1\uffff\1\141\1\151\1\uffff\1\154\1\172\1\154\1\uffff\1\165\1\157\1\162\1\102\2\uffff\2\156\1\171\1\172\1\151\1\162\1\143\1\150\1\145\1\162\1\141\1\172\1\145\1\uffff\1\154\1\141\1\145\1\160\1\141\1\147\1\150\1\172\2\150\1\145\1\172\1\uffff\1\172\1\157\1\167\1\145\1\164\1\165\1\147\1\157\1\uffff\1\172\2\162\1\106\1\151\1\163\1\144\1\172\1\uffff\1\143\1\172\1\150\1\162\1\155\1\164\1\156\1\uffff\1\172\1\154\1\147\1\163\1\145\1\160\1\157\1\172\1\uffff\1\164\2\172\2\uffff\1\146\2\172\1\151\1\154\1\156\1\147\1\uffff\1\156\1\164\1\151\1\156\1\163\1\151\1\145\1\uffff\1\172\1\uffff\1\172\1\157\1\123\1\172\1\143\1\uffff\1\171\1\145\1\163\1\143\1\163\1\162\1\uffff\1\172\2\uffff\1\172\2\uffff\1\160\1\164\1\145\2\172\1\120\1\154\1\144\1\172\1\157\1\144\2\uffff\1\156\1\145\1\uffff\1\145\3\172\1\164\1\145\1\171\2\uffff\2\172\1\162\2\uffff\1\162\1\164\1\151\1\uffff\1\156\1\111\1\151\1\164\1\157\3\uffff\1\151\1\144\1\172\2\uffff\1\172\1\151\1\145\1\156\1\172\1\155\1\172\1\164\1\146\1\166\1\111\2\uffff\1\156\1\162\1\147\1\uffff\1\141\1\145\1\151\1\172\1\145\1\155\1\164\2\172\1\147\1\144\1\156\1\uffff\1\172\1\141\1\145\2\uffff\1\145\1\172\1\147\1\uffff\1\147\1\162\1\172\1\uffff\1\163\1\145\1\172\1\uffff\2\172\3\uffff";
     static final String DFA21_acceptS =
-        "\24\uffff\1\50\1\uffff\1\53\2\uffff\1\57\1\60\1\61\1\62\1\63\1\64\1\65\1\66\13\uffff\1\141\2\142\1\145\1\146\1\uffff\1\23\1\1\1\2\1\133\1\3\1\114\1\4\1\35\1\26\1\5\1\20\1\36\1\27\1\6\1\31\1\30\1\7\1\143\1\144\1\32\1\10\1\33\1\uffff\1\34\1\15\1\16\1\24\1\17\1\uffff\1\37\1\25\1\132\1\113\1\uffff\1\141\21\uffff\1\50\2\uffff\1\53\3\uffff\1\57\1\60\1\61\1\62\1\63\1\64\1\65\1\66\2\uffff\1\131\1\74\15\uffff\1\136\1\uffff\1\137\1\140\1\142\1\145\1\13\1\11\1\14\1\12\1\21\1\22\16\uffff\1\71\14\uffff\1\70\3\uffff\1\101\3\uffff\1\130\10\uffff\1\40\1\134\15\uffff\1\77\17\uffff\1\102\3\uffff\1\107\10\uffff\1\72\16\uffff\1\76\11\uffff\1\103\2\uffff\1\135\7\uffff\1\56\1\uffff\1\45\4\uffff\1\120\1\uffff\1\46\5\uffff\1\112\1\uffff\1\55\1\100\6\uffff\1\105\1\124\6\uffff\1\42\1\73\2\uffff\1\43\6\uffff\1\54\4\uffff\1\125\1\104\1\106\2\uffff\1\41\5\uffff\1\110\1\47\1\122\3\uffff\1\75\14\uffff\1\116\3\uffff\1\44\2\uffff\1\121\11\uffff\1\67\4\uffff\1\126\1\127\2\uffff\1\123\2\uffff\1\117\1\uffff\1\111\2\uffff\1\51\2\uffff\1\52\2\uffff\1\115";
+        "\27\uffff\1\55\1\56\1\uffff\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\70\12\uffff\1\143\2\144\1\147\1\150\1\uffff\1\23\1\1\1\2\1\135\1\3\1\116\1\4\1\35\1\26\1\5\1\20\1\36\1\27\1\6\1\31\1\30\1\7\1\145\1\146\1\32\1\10\1\33\1\uffff\1\34\1\15\1\16\1\24\1\17\1\uffff\1\37\1\25\1\134\1\115\1\uffff\1\143\26\uffff\1\55\1\56\5\uffff\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\uffff\1\133\1\76\11\uffff\1\140\1\uffff\1\141\1\142\1\144\1\147\1\13\1\11\1\14\1\12\1\21\1\22\15\uffff\1\73\24\uffff\1\72\2\uffff\1\103\3\uffff\1\132\4\uffff\1\40\1\136\15\uffff\1\101\14\uffff\1\111\10\uffff\1\104\10\uffff\1\74\7\uffff\1\127\10\uffff\1\100\3\uffff\1\57\1\137\7\uffff\1\105\7\uffff\1\60\1\uffff\1\45\5\uffff\1\46\6\uffff\1\114\1\uffff\1\53\1\102\1\uffff\1\107\1\120\13\uffff\1\42\1\75\2\uffff\1\43\7\uffff\1\52\1\106\3\uffff\1\121\1\110\3\uffff\1\41\5\uffff\1\112\1\47\1\130\3\uffff\1\126\1\77\13\uffff\1\54\1\117\3\uffff\1\44\14\uffff\1\71\3\uffff\1\122\1\124\3\uffff\1\131\3\uffff\1\113\3\uffff\1\50\2\uffff\1\123\1\125\1\51";
     static final String DFA21_specialS =
-        "\1\0\u0185\uffff}>";
+        "\1\0\u018c\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\60\2\57\2\60\1\57\22\60\1\57\1\11\1\55\1\37\1\54\1\10\1\3\1\56\1\33\1\34\1\6\1\4\1\35\1\5\1\14\1\7\1\51\11\52\1\42\1\31\1\13\1\1\1\12\1\15\1\32\32\54\1\40\1\60\1\36\1\53\1\54\1\60\1\41\1\54\1\25\1\43\1\17\1\22\1\54\1\27\1\21\1\54\1\50\2\54\1\44\1\54\1\23\1\54\1\46\1\20\1\45\1\47\1\16\1\30\3\54\1\24\1\2\1\26\uff82\60",
+            "\11\60\2\57\2\60\1\57\22\60\1\57\1\11\1\55\1\40\1\54\1\10\1\3\1\56\1\34\1\35\1\6\1\4\1\36\1\5\1\14\1\7\1\51\11\52\1\43\1\32\1\13\1\1\1\12\1\15\1\33\32\54\1\41\1\60\1\37\1\53\1\54\1\60\1\42\1\54\1\24\1\44\1\17\1\22\1\54\1\25\1\21\1\54\1\50\2\54\1\45\1\54\1\23\1\54\1\46\1\20\1\31\1\47\1\16\1\26\3\54\1\27\1\2\1\30\uff82\60",
             "\1\61\1\62",
             "\1\64",
             "\1\66",
@@ -3655,15 +3713,16 @@ public class InternalMenuDslLexer extends Lexer {
             "\1\121\13\uffff\1\120",
             "\1\123",
             "\1\127\1\uffff\1\126\11\uffff\1\125",
-            "\1\134\13\uffff\1\130\1\131\1\uffff\1\132\1\uffff\1\133",
-            "\1\137\6\uffff\1\135\1\136",
+            "\1\130\1\131\1\uffff\1\132\1\uffff\1\133",
+            "\1\137\2\uffff\1\136\6\uffff\1\134\1\135",
             "\1\140\7\uffff\1\142\5\uffff\1\141",
             "\1\143\3\uffff\1\145\14\uffff\1\144",
+            "\1\147\15\uffff\1\146",
+            "\1\150",
+            "\1\152\1\151",
             "",
-            "\1\150\15\uffff\1\147",
             "",
-            "\1\152",
-            "\1\154\1\153",
+            "\1\160\6\uffff\1\157\6\uffff\1\161\2\uffff\1\155\6\uffff\1\156",
             "",
             "",
             "",
@@ -3672,11 +3731,10 @@ public class InternalMenuDslLexer extends Lexer {
             "",
             "",
             "",
-            "\1\166\17\uffff\1\165",
-            "\1\167",
-            "\1\171\3\uffff\1\173\5\uffff\1\172",
-            "\1\174\15\uffff\1\176\1\uffff\1\175",
-            "\1\u0082\6\uffff\1\u0080\11\uffff\1\u0081\6\uffff\1\177",
+            "\1\172",
+            "\1\173",
+            "\1\175\3\uffff\1\177\5\uffff\1\176",
+            "\1\u0080\15\uffff\1\u0082\1\uffff\1\u0081",
             "\1\u0083",
             "\1\u0084",
             "\1\u0085",
@@ -3730,26 +3788,31 @@ public class InternalMenuDslLexer extends Lexer {
             "\1\u0098",
             "\1\u0099",
             "\1\u009a",
-            "\1\u009b",
-            "\1\u009c",
-            "\1\u009e\16\uffff\1\u009d",
-            "\1\u009f",
+            "\1\u009b\4\uffff\1\u009c",
+            "\1\u009d",
+            "\1\u009e",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u00a0",
             "\1\u00a1",
             "\1\u00a2",
             "\1\u00a3",
             "\1\u00a4",
             "\1\u00a5",
             "\1\u00a6",
-            "",
             "\1\u00a7",
-            "\1\u00a8\1\u00a9",
-            "",
+            "\1\u00a9\1\u00a8",
             "\1\u00aa",
             "\1\u00ab",
             "\1\u00ac",
             "",
             "",
+            "\1\u00ad\17\uffff\1\u00af\3\uffff\1\u00ae",
+            "\1\u00b0",
+            "\1\u00b1",
+            "\1\u00b2",
+            "\1\u00b3",
+            "",
+            "",
             "",
             "",
             "",
@@ -3757,22 +3820,17 @@ public class InternalMenuDslLexer extends Lexer {
             "",
             "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u00ae",
             "",
             "",
-            "\1\u00af\14\uffff\1\u00b0",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u00b2",
-            "\1\u00b3",
-            "\1\u00b4",
+            "\1\u00b5\14\uffff\1\u00b6",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u00b6",
-            "\1\u00b7",
-            "\1\u00b9\3\uffff\1\u00b8",
+            "\1\u00b8",
+            "\1\u00b9",
             "\1\u00ba",
-            "\1\u00bb",
-            "\1\u00bc",
-            "\1\u00bd",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u00bd\3\uffff\1\u00bc",
+            "\1\u00be",
+            "\1\u00bf",
             "",
             "\12\u0087\10\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089\22\uffff\1\u0087\2\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089",
             "",
@@ -3787,8 +3845,6 @@ public class InternalMenuDslLexer extends Lexer {
             "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u00c0",
-            "\1\u00c1",
             "\1\u00c2",
             "\1\u00c3",
             "\1\u00c4",
@@ -3799,235 +3855,244 @@ public class InternalMenuDslLexer extends Lexer {
             "\1\u00c9",
             "\1\u00ca",
             "\1\u00cb",
-            "",
             "\1\u00cc",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "",
+            "\1\u00cd",
             "\1\u00ce",
-            "\1\u00cf",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u00d0",
             "\1\u00d1",
             "\1\u00d2",
             "\1\u00d3",
             "\1\u00d4",
-            "\1\u00d5",
-            "\1\u00d6",
+            "\1\u00d6\1\uffff\1\u00d5",
             "\1\u00d7",
-            "",
             "\1\u00d8",
             "\1\u00d9",
-            "\1\u00db\5\uffff\1\u00da",
-            "",
-            "\1\u00dc",
+            "\1\u00da",
+            "\1\u00db",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u00dd",
             "\1\u00de",
-            "",
             "\1\u00df",
             "\1\u00e0",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u00e1",
+            "",
             "\1\u00e2",
             "\1\u00e3",
+            "",
             "\1\u00e4",
-            "\1\u00e5",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u00e6",
             "",
-            "",
             "\1\u00e7",
             "\1\u00e8",
             "\1\u00e9",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u00ea",
+            "",
+            "",
             "\1\u00eb",
             "\1\u00ec",
             "\1\u00ed",
-            "\1\u00ee",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u00ef",
             "\1\u00f0",
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
-            "",
             "\1\u00f4",
             "\1\u00f5",
-            "\1\u00f6",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u00f7",
+            "",
             "\1\u00f8",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u00f9",
             "\1\u00fa",
             "\1\u00fb",
             "\1\u00fc",
             "\1\u00fd",
             "\1\u00fe",
-            "\1\u00ff",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u0100",
             "\1\u0101",
             "\1\u0102",
-            "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0104",
-            "\1\u0105",
             "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u0105",
+            "\1\u0106",
             "\1\u0107",
             "\1\u0108",
             "\1\u0109",
             "\1\u010a",
-            "\1\u010b\16\uffff\1\u010c",
-            "\1\u010d",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u010b",
             "",
-            "\1\u010f",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0111",
-            "\1\u0112",
+            "\1\u010d",
+            "\1\u010e",
+            "\1\u010f",
+            "\1\u0110",
+            "\1\u0111\16\uffff\1\u0112",
             "\1\u0113",
-            "\1\u0114",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0116",
+            "",
+            "\1\u0115",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u0117",
             "\1\u0118",
             "\1\u0119",
             "\1\u011a",
             "\1\u011b",
-            "\1\u011c",
             "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u011d",
             "\1\u011e",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u011f",
+            "\1\u0120",
             "\1\u0121",
             "\1\u0122",
-            "\1\u0123",
-            "\1\u0124",
-            "\1\u0125",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "",
-            "\1\u0126",
+            "\1\u0124",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "",
             "",
+            "\1\u0127",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0129",
             "\1\u012a",
             "\1\u012b",
             "\1\u012c",
             "\1\u012d",
-            "\1\u012e",
             "",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u012e",
+            "\1\u012f",
+            "\1\u0130",
             "\1\u0131",
             "\1\u0132",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "",
+            "\1\u0133",
             "\1\u0134",
             "",
-            "\1\u0135",
-            "\1\u0136",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u0137",
             "\1\u0138",
-            "\1\u0139",
-            "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "",
+            "\1\u013a",
             "",
             "\1\u013b",
             "\1\u013c",
             "\1\u013d",
             "\1\u013e",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u013f",
+            "\1\u0140",
+            "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "",
             "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0142",
-            "\1\u0143",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0145",
-            "\1\u0146",
             "",
             "",
-            "\1\u0147",
-            "\1\u0148",
-            "",
-            "\1\u0149",
+            "\1\u0143",
+            "\1\u0144",
+            "\1\u0145",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u0148",
+            "\1\u0149",
+            "\1\u014a",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u014c",
             "\1\u014d",
-            "\1\u014e",
-            "",
-            "\1\u014f",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0151",
-            "\1\u0152",
             "",
             "",
+            "\1\u014e",
+            "\1\u014f",
             "",
-            "\1\u0153",
+            "\1\u0150",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u0154",
-            "",
             "\1\u0155",
             "\1\u0156",
-            "\1\u0157",
-            "\1\u0158",
-            "\1\u0159",
             "",
             "",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u0159",
+            "",
             "",
             "\1\u015a",
             "\1\u015b",
             "\1\u015c",
             "",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u015d",
             "\1\u015e",
             "\1\u015f",
             "\1\u0160",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u0161",
+            "",
+            "",
+            "",
             "\1\u0162",
             "\1\u0163",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0165",
+            "",
+            "",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u0166",
             "\1\u0167",
             "\1\u0168",
-            "",
-            "\1\u0169",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u016a",
             "\1\u016b",
-            "",
             "\1\u016c",
             "\1\u016d",
-            "",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u016e",
             "\1\u016f",
+            "",
+            "",
             "\1\u0170",
             "\1\u0171",
             "\1\u0172",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0175",
-            "\1\u0176",
             "",
+            "\1\u0173",
+            "\1\u0174",
+            "\1\u0175",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "\1\u0177",
             "\1\u0178",
             "\1\u0179",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "",
-            "",
-            "\1\u017b",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "",
+            "\1\u017c",
             "\1\u017d",
             "\1\u017e",
             "",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "",
             "\1\u0180",
             "\1\u0181",
             "",
-            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
-            "\1\u0183",
             "",
+            "\1\u0182",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\u0184",
+            "",
+            "\1\u0185",
+            "\1\u0186",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "",
+            "\1\u0188",
+            "\1\u0189",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "",
+            "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
             "\1\124\13\uffff\12\124\7\uffff\32\124\4\uffff\1\124\1\uffff\32\124",
+            "",
+            "",
             ""
     };
 
@@ -4061,7 +4126,7 @@ public class InternalMenuDslLexer extends Lexer {
             this.transition = DFA21_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__13 | T__14 | 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 | 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__13 | T__14 | 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 | 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;
@@ -4109,41 +4174,41 @@ public class InternalMenuDslLexer extends Lexer {
 
                         else if ( (LA21_0=='p') ) {s = 19;}
 
-                        else if ( (LA21_0=='{') ) {s = 20;}
+                        else if ( (LA21_0=='c') ) {s = 20;}
 
-                        else if ( (LA21_0=='c') ) {s = 21;}
+                        else if ( (LA21_0=='h') ) {s = 21;}
 
-                        else if ( (LA21_0=='}') ) {s = 22;}
+                        else if ( (LA21_0=='w') ) {s = 22;}
 
-                        else if ( (LA21_0=='h') ) {s = 23;}
+                        else if ( (LA21_0=='{') ) {s = 23;}
 
-                        else if ( (LA21_0=='w') ) {s = 24;}
+                        else if ( (LA21_0=='}') ) {s = 24;}
 
-                        else if ( (LA21_0==';') ) {s = 25;}
+                        else if ( (LA21_0=='t') ) {s = 25;}
 
-                        else if ( (LA21_0=='@') ) {s = 26;}
+                        else if ( (LA21_0==';') ) {s = 26;}
 
-                        else if ( (LA21_0=='(') ) {s = 27;}
+                        else if ( (LA21_0=='@') ) {s = 27;}
 
-                        else if ( (LA21_0==')') ) {s = 28;}
+                        else if ( (LA21_0=='(') ) {s = 28;}
 
-                        else if ( (LA21_0==',') ) {s = 29;}
+                        else if ( (LA21_0==')') ) {s = 29;}
 
-                        else if ( (LA21_0==']') ) {s = 30;}
+                        else if ( (LA21_0==',') ) {s = 30;}
 
-                        else if ( (LA21_0=='#') ) {s = 31;}
+                        else if ( (LA21_0==']') ) {s = 31;}
 
-                        else if ( (LA21_0=='[') ) {s = 32;}
+                        else if ( (LA21_0=='#') ) {s = 32;}
 
-                        else if ( (LA21_0=='a') ) {s = 33;}
+                        else if ( (LA21_0=='[') ) {s = 33;}
 
-                        else if ( (LA21_0==':') ) {s = 34;}
+                        else if ( (LA21_0=='a') ) {s = 34;}
 
-                        else if ( (LA21_0=='d') ) {s = 35;}
+                        else if ( (LA21_0==':') ) {s = 35;}
 
-                        else if ( (LA21_0=='n') ) {s = 36;}
+                        else if ( (LA21_0=='d') ) {s = 36;}
 
-                        else if ( (LA21_0=='t') ) {s = 37;}
+                        else if ( (LA21_0=='n') ) {s = 37;}
 
                         else if ( (LA21_0=='r') ) {s = 38;}
 
diff --git a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslParser.java b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslParser.java
index 4cfe6c6..682aa18 100644
--- a/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslParser.java
+++ b/org.eclipse.osbp.xtext.menu.ide/src-gen/org/eclipse/osbp/xtext/menu/ide/contentassist/antlr/internal/InternalMenuDslParser.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'='", "'||'", "'&&'", "'+='", "'-='", "'*='", "'/='", "'%='", "'=='", "'!='", "'==='", "'!=='", "'>='", "'>'", "'<'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'*'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'.'", "'val'", "'extends'", "'static'", "'import'", "'extension'", "'super'", "'false'", "'package'", "'{'", "'expandedImage'", "'collapsedImage'", "'}'", "'height'", "'width'", "'entry'", "';'", "'@'", "'('", "')'", "','", "']'", "'#'", "'['", "'instanceof'", "'as'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'new'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'accordionSubmenu'", "'designer'", "'describedBy'", "'image'", "'showBadge'", "'process'", "'perspective'", "'table'", "'dialog'", "'userFilter'", "'keyBinding'", "'ns'", "'::'", "'?.'", "'|'", "'var'", "'true'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'='", "'||'", "'&&'", "'+='", "'-='", "'*='", "'/='", "'%='", "'=='", "'!='", "'==='", "'!=='", "'>='", "'>'", "'<'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'*'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'.'", "'val'", "'extends'", "'static'", "'import'", "'extension'", "'super'", "'false'", "'package'", "'expandedImage'", "'collapsedImage'", "'height'", "'width'", "'category'", "'{'", "'}'", "'tree'", "'entry'", "';'", "'@'", "'('", "')'", "','", "']'", "'#'", "'['", "'instanceof'", "'as'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'new'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'designer'", "'table'", "'dialog'", "'userFilter'", "'reportPrinter'", "'keyBinding'", "'systemSettings'", "'tooltip'", "'icon'", "'process'", "'perspective'", "'ns'", "'::'", "'?.'", "'|'", "'var'", "'true'"
     };
     public static final int RULE_HEX=6;
     public static final int T__50=50;
@@ -121,11 +121,13 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     public static final int RULE_ANY_OTHER=12;
     public static final int T__88=88;
     public static final int T__89=89;
+    public static final int T__107=107;
     public static final int T__84=84;
     public static final int T__104=104;
     public static final int T__85=85;
     public static final int T__103=103;
     public static final int T__86=86;
+    public static final int T__106=106;
     public static final int T__87=87;
     public static final int T__105=105;
 
@@ -334,12 +336,182 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleMenuPackage"
 
 
+    // $ANTLR start "entryRuleMenuCategory"
+    // InternalMenuDsl.g:104:1: entryRuleMenuCategory : ruleMenuCategory EOF ;
+    public final void entryRuleMenuCategory() throws RecognitionException {
+        try {
+            // InternalMenuDsl.g:105:1: ( ruleMenuCategory EOF )
+            // InternalMenuDsl.g:106:1: ruleMenuCategory EOF
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuCategoryRule()); 
+            }
+            pushFollow(FOLLOW_1);
+            ruleMenuCategory();
+
+            state._fsp--;
+            if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuCategoryRule()); 
+            }
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleMenuCategory"
+
+
+    // $ANTLR start "ruleMenuCategory"
+    // InternalMenuDsl.g:113:1: ruleMenuCategory : ( ( rule__MenuCategory__Group__0 ) ) ;
+    public final void ruleMenuCategory() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:117:2: ( ( ( rule__MenuCategory__Group__0 ) ) )
+            // InternalMenuDsl.g:118:2: ( ( rule__MenuCategory__Group__0 ) )
+            {
+            // InternalMenuDsl.g:118:2: ( ( rule__MenuCategory__Group__0 ) )
+            // InternalMenuDsl.g:119:3: ( rule__MenuCategory__Group__0 )
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuCategoryAccess().getGroup()); 
+            }
+            // InternalMenuDsl.g:120:3: ( rule__MenuCategory__Group__0 )
+            // InternalMenuDsl.g:120:4: rule__MenuCategory__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuCategory__Group__0();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuCategoryAccess().getGroup()); 
+            }
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleMenuCategory"
+
+
+    // $ANTLR start "entryRuleMenuTree"
+    // InternalMenuDsl.g:129:1: entryRuleMenuTree : ruleMenuTree EOF ;
+    public final void entryRuleMenuTree() throws RecognitionException {
+        try {
+            // InternalMenuDsl.g:130:1: ( ruleMenuTree EOF )
+            // InternalMenuDsl.g:131:1: ruleMenuTree EOF
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuTreeRule()); 
+            }
+            pushFollow(FOLLOW_1);
+            ruleMenuTree();
+
+            state._fsp--;
+            if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuTreeRule()); 
+            }
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleMenuTree"
+
+
+    // $ANTLR start "ruleMenuTree"
+    // InternalMenuDsl.g:138:1: ruleMenuTree : ( ( rule__MenuTree__Group__0 ) ) ;
+    public final void ruleMenuTree() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:142:2: ( ( ( rule__MenuTree__Group__0 ) ) )
+            // InternalMenuDsl.g:143:2: ( ( rule__MenuTree__Group__0 ) )
+            {
+            // InternalMenuDsl.g:143:2: ( ( rule__MenuTree__Group__0 ) )
+            // InternalMenuDsl.g:144:3: ( rule__MenuTree__Group__0 )
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuTreeAccess().getGroup()); 
+            }
+            // InternalMenuDsl.g:145:3: ( rule__MenuTree__Group__0 )
+            // InternalMenuDsl.g:145:4: rule__MenuTree__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuTree__Group__0();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuTreeAccess().getGroup()); 
+            }
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleMenuTree"
+
+
     // $ANTLR start "entryRuleMenuEntry"
-    // InternalMenuDsl.g:104:1: entryRuleMenuEntry : ruleMenuEntry EOF ;
+    // InternalMenuDsl.g:154:1: entryRuleMenuEntry : ruleMenuEntry EOF ;
     public final void entryRuleMenuEntry() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:105:1: ( ruleMenuEntry EOF )
-            // InternalMenuDsl.g:106:1: ruleMenuEntry EOF
+            // InternalMenuDsl.g:155:1: ( ruleMenuEntry EOF )
+            // InternalMenuDsl.g:156:1: ruleMenuEntry EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuEntryRule()); 
@@ -369,23 +541,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMenuEntry"
-    // InternalMenuDsl.g:113:1: ruleMenuEntry : ( ( rule__MenuEntry__Group__0 ) ) ;
+    // InternalMenuDsl.g:163:1: ruleMenuEntry : ( ( rule__MenuEntry__Group__0 ) ) ;
     public final void ruleMenuEntry() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:117:2: ( ( ( rule__MenuEntry__Group__0 ) ) )
-            // InternalMenuDsl.g:118:2: ( ( rule__MenuEntry__Group__0 ) )
+            // InternalMenuDsl.g:167:2: ( ( ( rule__MenuEntry__Group__0 ) ) )
+            // InternalMenuDsl.g:168:2: ( ( rule__MenuEntry__Group__0 ) )
             {
-            // InternalMenuDsl.g:118:2: ( ( rule__MenuEntry__Group__0 ) )
-            // InternalMenuDsl.g:119:3: ( rule__MenuEntry__Group__0 )
+            // InternalMenuDsl.g:168:2: ( ( rule__MenuEntry__Group__0 ) )
+            // InternalMenuDsl.g:169:3: ( rule__MenuEntry__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuEntryAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:120:3: ( rule__MenuEntry__Group__0 )
-            // InternalMenuDsl.g:120:4: rule__MenuEntry__Group__0
+            // InternalMenuDsl.g:170:3: ( rule__MenuEntry__Group__0 )
+            // InternalMenuDsl.g:170:4: rule__MenuEntry__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__MenuEntry__Group__0();
@@ -420,11 +592,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTRANSLATABLESTRING"
-    // InternalMenuDsl.g:129:1: entryRuleTRANSLATABLESTRING : ruleTRANSLATABLESTRING EOF ;
+    // InternalMenuDsl.g:179:1: entryRuleTRANSLATABLESTRING : ruleTRANSLATABLESTRING EOF ;
     public final void entryRuleTRANSLATABLESTRING() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:130:1: ( ruleTRANSLATABLESTRING EOF )
-            // InternalMenuDsl.g:131:1: ruleTRANSLATABLESTRING EOF
+            // InternalMenuDsl.g:180:1: ( ruleTRANSLATABLESTRING EOF )
+            // InternalMenuDsl.g:181:1: ruleTRANSLATABLESTRING EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTRANSLATABLESTRINGRule()); 
@@ -454,17 +626,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTRANSLATABLESTRING"
-    // InternalMenuDsl.g:138:1: ruleTRANSLATABLESTRING : ( RULE_STRING ) ;
+    // InternalMenuDsl.g:188:1: ruleTRANSLATABLESTRING : ( RULE_STRING ) ;
     public final void ruleTRANSLATABLESTRING() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:142:2: ( ( RULE_STRING ) )
-            // InternalMenuDsl.g:143:2: ( RULE_STRING )
+            // InternalMenuDsl.g:192:2: ( ( RULE_STRING ) )
+            // InternalMenuDsl.g:193:2: ( RULE_STRING )
             {
-            // InternalMenuDsl.g:143:2: ( RULE_STRING )
-            // InternalMenuDsl.g:144:3: RULE_STRING
+            // InternalMenuDsl.g:193:2: ( RULE_STRING )
+            // InternalMenuDsl.g:194:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTRANSLATABLESTRINGAccess().getSTRINGTerminalRuleCall()); 
@@ -495,11 +667,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTRANSLATABLEID"
-    // InternalMenuDsl.g:154:1: entryRuleTRANSLATABLEID : ruleTRANSLATABLEID EOF ;
+    // InternalMenuDsl.g:204:1: entryRuleTRANSLATABLEID : ruleTRANSLATABLEID EOF ;
     public final void entryRuleTRANSLATABLEID() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:155:1: ( ruleTRANSLATABLEID EOF )
-            // InternalMenuDsl.g:156:1: ruleTRANSLATABLEID EOF
+            // InternalMenuDsl.g:205:1: ( ruleTRANSLATABLEID EOF )
+            // InternalMenuDsl.g:206:1: ruleTRANSLATABLEID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTRANSLATABLEIDRule()); 
@@ -529,17 +701,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTRANSLATABLEID"
-    // InternalMenuDsl.g:163:1: ruleTRANSLATABLEID : ( RULE_ID ) ;
+    // InternalMenuDsl.g:213:1: ruleTRANSLATABLEID : ( RULE_ID ) ;
     public final void ruleTRANSLATABLEID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:167:2: ( ( RULE_ID ) )
-            // InternalMenuDsl.g:168:2: ( RULE_ID )
+            // InternalMenuDsl.g:217:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:218:2: ( RULE_ID )
             {
-            // InternalMenuDsl.g:168:2: ( RULE_ID )
-            // InternalMenuDsl.g:169:3: RULE_ID
+            // InternalMenuDsl.g:218:2: ( RULE_ID )
+            // InternalMenuDsl.g:219:3: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTRANSLATABLEIDAccess().getIDTerminalRuleCall()); 
@@ -570,11 +742,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // InternalMenuDsl.g:179:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
+    // InternalMenuDsl.g:229:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
     public final void entryRuleXImportDeclaration() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:180:1: ( ruleXImportDeclaration EOF )
-            // InternalMenuDsl.g:181:1: ruleXImportDeclaration EOF
+            // InternalMenuDsl.g:230:1: ( ruleXImportDeclaration EOF )
+            // InternalMenuDsl.g:231:1: ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationRule()); 
@@ -604,23 +776,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // InternalMenuDsl.g:188:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
+    // InternalMenuDsl.g:238:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
     public final void ruleXImportDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:192:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
-            // InternalMenuDsl.g:193:2: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalMenuDsl.g:242:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
+            // InternalMenuDsl.g:243:2: ( ( rule__XImportDeclaration__Group__0 ) )
             {
-            // InternalMenuDsl.g:193:2: ( ( rule__XImportDeclaration__Group__0 ) )
-            // InternalMenuDsl.g:194:3: ( rule__XImportDeclaration__Group__0 )
+            // InternalMenuDsl.g:243:2: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalMenuDsl.g:244:3: ( rule__XImportDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:195:3: ( rule__XImportDeclaration__Group__0 )
-            // InternalMenuDsl.g:195:4: rule__XImportDeclaration__Group__0
+            // InternalMenuDsl.g:245:3: ( rule__XImportDeclaration__Group__0 )
+            // InternalMenuDsl.g:245:4: rule__XImportDeclaration__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__0();
@@ -655,11 +827,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // InternalMenuDsl.g:204:1: entryRuleXAnnotation : ruleXAnnotation EOF ;
+    // InternalMenuDsl.g:254:1: entryRuleXAnnotation : ruleXAnnotation EOF ;
     public final void entryRuleXAnnotation() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:205:1: ( ruleXAnnotation EOF )
-            // InternalMenuDsl.g:206:1: ruleXAnnotation EOF
+            // InternalMenuDsl.g:255:1: ( ruleXAnnotation EOF )
+            // InternalMenuDsl.g:256:1: ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationRule()); 
@@ -689,23 +861,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // InternalMenuDsl.g:213:1: ruleXAnnotation : ( ( rule__XAnnotation__Group__0 ) ) ;
+    // InternalMenuDsl.g:263:1: ruleXAnnotation : ( ( rule__XAnnotation__Group__0 ) ) ;
     public final void ruleXAnnotation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:217:2: ( ( ( rule__XAnnotation__Group__0 ) ) )
-            // InternalMenuDsl.g:218:2: ( ( rule__XAnnotation__Group__0 ) )
+            // InternalMenuDsl.g:267:2: ( ( ( rule__XAnnotation__Group__0 ) ) )
+            // InternalMenuDsl.g:268:2: ( ( rule__XAnnotation__Group__0 ) )
             {
-            // InternalMenuDsl.g:218:2: ( ( rule__XAnnotation__Group__0 ) )
-            // InternalMenuDsl.g:219:3: ( rule__XAnnotation__Group__0 )
+            // InternalMenuDsl.g:268:2: ( ( rule__XAnnotation__Group__0 ) )
+            // InternalMenuDsl.g:269:3: ( rule__XAnnotation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:220:3: ( rule__XAnnotation__Group__0 )
-            // InternalMenuDsl.g:220:4: rule__XAnnotation__Group__0
+            // InternalMenuDsl.g:270:3: ( rule__XAnnotation__Group__0 )
+            // InternalMenuDsl.g:270:4: rule__XAnnotation__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__0();
@@ -740,11 +912,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // InternalMenuDsl.g:229:1: entryRuleXAnnotationElementValuePair : ruleXAnnotationElementValuePair EOF ;
+    // InternalMenuDsl.g:279:1: entryRuleXAnnotationElementValuePair : ruleXAnnotationElementValuePair EOF ;
     public final void entryRuleXAnnotationElementValuePair() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:230:1: ( ruleXAnnotationElementValuePair EOF )
-            // InternalMenuDsl.g:231:1: ruleXAnnotationElementValuePair EOF
+            // InternalMenuDsl.g:280:1: ( ruleXAnnotationElementValuePair EOF )
+            // InternalMenuDsl.g:281:1: ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairRule()); 
@@ -774,23 +946,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // InternalMenuDsl.g:238:1: ruleXAnnotationElementValuePair : ( ( rule__XAnnotationElementValuePair__Group__0 ) ) ;
+    // InternalMenuDsl.g:288:1: ruleXAnnotationElementValuePair : ( ( rule__XAnnotationElementValuePair__Group__0 ) ) ;
     public final void ruleXAnnotationElementValuePair() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:242:2: ( ( ( rule__XAnnotationElementValuePair__Group__0 ) ) )
-            // InternalMenuDsl.g:243:2: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
+            // InternalMenuDsl.g:292:2: ( ( ( rule__XAnnotationElementValuePair__Group__0 ) ) )
+            // InternalMenuDsl.g:293:2: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
             {
-            // InternalMenuDsl.g:243:2: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
-            // InternalMenuDsl.g:244:3: ( rule__XAnnotationElementValuePair__Group__0 )
+            // InternalMenuDsl.g:293:2: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
+            // InternalMenuDsl.g:294:3: ( rule__XAnnotationElementValuePair__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:245:3: ( rule__XAnnotationElementValuePair__Group__0 )
-            // InternalMenuDsl.g:245:4: rule__XAnnotationElementValuePair__Group__0
+            // InternalMenuDsl.g:295:3: ( rule__XAnnotationElementValuePair__Group__0 )
+            // InternalMenuDsl.g:295:4: rule__XAnnotationElementValuePair__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__0();
@@ -825,11 +997,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // InternalMenuDsl.g:254:1: entryRuleXAnnotationElementValueOrCommaList : ruleXAnnotationElementValueOrCommaList EOF ;
+    // InternalMenuDsl.g:304:1: entryRuleXAnnotationElementValueOrCommaList : ruleXAnnotationElementValueOrCommaList EOF ;
     public final void entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:255:1: ( ruleXAnnotationElementValueOrCommaList EOF )
-            // InternalMenuDsl.g:256:1: ruleXAnnotationElementValueOrCommaList EOF
+            // InternalMenuDsl.g:305:1: ( ruleXAnnotationElementValueOrCommaList EOF )
+            // InternalMenuDsl.g:306:1: ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
@@ -859,23 +1031,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // InternalMenuDsl.g:263:1: ruleXAnnotationElementValueOrCommaList : ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) ;
+    // InternalMenuDsl.g:313:1: ruleXAnnotationElementValueOrCommaList : ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) ;
     public final void ruleXAnnotationElementValueOrCommaList() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:267:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) )
-            // InternalMenuDsl.g:268:2: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
+            // InternalMenuDsl.g:317:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) )
+            // InternalMenuDsl.g:318:2: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
             {
-            // InternalMenuDsl.g:268:2: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
-            // InternalMenuDsl.g:269:3: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
+            // InternalMenuDsl.g:318:2: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
+            // InternalMenuDsl.g:319:3: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:270:3: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
-            // InternalMenuDsl.g:270:4: rule__XAnnotationElementValueOrCommaList__Alternatives
+            // InternalMenuDsl.g:320:3: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
+            // InternalMenuDsl.g:320:4: rule__XAnnotationElementValueOrCommaList__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Alternatives();
@@ -910,11 +1082,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // InternalMenuDsl.g:279:1: entryRuleXAnnotationElementValue : ruleXAnnotationElementValue EOF ;
+    // InternalMenuDsl.g:329:1: entryRuleXAnnotationElementValue : ruleXAnnotationElementValue EOF ;
     public final void entryRuleXAnnotationElementValue() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:280:1: ( ruleXAnnotationElementValue EOF )
-            // InternalMenuDsl.g:281:1: ruleXAnnotationElementValue EOF
+            // InternalMenuDsl.g:330:1: ( ruleXAnnotationElementValue EOF )
+            // InternalMenuDsl.g:331:1: ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueRule()); 
@@ -944,23 +1116,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // InternalMenuDsl.g:288:1: ruleXAnnotationElementValue : ( ( rule__XAnnotationElementValue__Alternatives ) ) ;
+    // InternalMenuDsl.g:338:1: ruleXAnnotationElementValue : ( ( rule__XAnnotationElementValue__Alternatives ) ) ;
     public final void ruleXAnnotationElementValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:292:2: ( ( ( rule__XAnnotationElementValue__Alternatives ) ) )
-            // InternalMenuDsl.g:293:2: ( ( rule__XAnnotationElementValue__Alternatives ) )
+            // InternalMenuDsl.g:342:2: ( ( ( rule__XAnnotationElementValue__Alternatives ) ) )
+            // InternalMenuDsl.g:343:2: ( ( rule__XAnnotationElementValue__Alternatives ) )
             {
-            // InternalMenuDsl.g:293:2: ( ( rule__XAnnotationElementValue__Alternatives ) )
-            // InternalMenuDsl.g:294:3: ( rule__XAnnotationElementValue__Alternatives )
+            // InternalMenuDsl.g:343:2: ( ( rule__XAnnotationElementValue__Alternatives ) )
+            // InternalMenuDsl.g:344:3: ( rule__XAnnotationElementValue__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:295:3: ( rule__XAnnotationElementValue__Alternatives )
-            // InternalMenuDsl.g:295:4: rule__XAnnotationElementValue__Alternatives
+            // InternalMenuDsl.g:345:3: ( rule__XAnnotationElementValue__Alternatives )
+            // InternalMenuDsl.g:345:4: rule__XAnnotationElementValue__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Alternatives();
@@ -995,11 +1167,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // InternalMenuDsl.g:304:1: entryRuleXAnnotationOrExpression : ruleXAnnotationOrExpression EOF ;
+    // InternalMenuDsl.g:354:1: entryRuleXAnnotationOrExpression : ruleXAnnotationOrExpression EOF ;
     public final void entryRuleXAnnotationOrExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:305:1: ( ruleXAnnotationOrExpression EOF )
-            // InternalMenuDsl.g:306:1: ruleXAnnotationOrExpression EOF
+            // InternalMenuDsl.g:355:1: ( ruleXAnnotationOrExpression EOF )
+            // InternalMenuDsl.g:356:1: ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationOrExpressionRule()); 
@@ -1029,23 +1201,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // InternalMenuDsl.g:313:1: ruleXAnnotationOrExpression : ( ( rule__XAnnotationOrExpression__Alternatives ) ) ;
+    // InternalMenuDsl.g:363:1: ruleXAnnotationOrExpression : ( ( rule__XAnnotationOrExpression__Alternatives ) ) ;
     public final void ruleXAnnotationOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:317:2: ( ( ( rule__XAnnotationOrExpression__Alternatives ) ) )
-            // InternalMenuDsl.g:318:2: ( ( rule__XAnnotationOrExpression__Alternatives ) )
+            // InternalMenuDsl.g:367:2: ( ( ( rule__XAnnotationOrExpression__Alternatives ) ) )
+            // InternalMenuDsl.g:368:2: ( ( rule__XAnnotationOrExpression__Alternatives ) )
             {
-            // InternalMenuDsl.g:318:2: ( ( rule__XAnnotationOrExpression__Alternatives ) )
-            // InternalMenuDsl.g:319:3: ( rule__XAnnotationOrExpression__Alternatives )
+            // InternalMenuDsl.g:368:2: ( ( rule__XAnnotationOrExpression__Alternatives ) )
+            // InternalMenuDsl.g:369:3: ( rule__XAnnotationOrExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationOrExpressionAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:320:3: ( rule__XAnnotationOrExpression__Alternatives )
-            // InternalMenuDsl.g:320:4: rule__XAnnotationOrExpression__Alternatives
+            // InternalMenuDsl.g:370:3: ( rule__XAnnotationOrExpression__Alternatives )
+            // InternalMenuDsl.g:370:4: rule__XAnnotationOrExpression__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationOrExpression__Alternatives();
@@ -1080,11 +1252,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXExpression"
-    // InternalMenuDsl.g:329:1: entryRuleXExpression : ruleXExpression EOF ;
+    // InternalMenuDsl.g:379:1: entryRuleXExpression : ruleXExpression EOF ;
     public final void entryRuleXExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:330:1: ( ruleXExpression EOF )
-            // InternalMenuDsl.g:331:1: ruleXExpression EOF
+            // InternalMenuDsl.g:380:1: ( ruleXExpression EOF )
+            // InternalMenuDsl.g:381:1: ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionRule()); 
@@ -1114,17 +1286,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXExpression"
-    // InternalMenuDsl.g:338:1: ruleXExpression : ( ruleXAssignment ) ;
+    // InternalMenuDsl.g:388:1: ruleXExpression : ( ruleXAssignment ) ;
     public final void ruleXExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:342:2: ( ( ruleXAssignment ) )
-            // InternalMenuDsl.g:343:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:392:2: ( ( ruleXAssignment ) )
+            // InternalMenuDsl.g:393:2: ( ruleXAssignment )
             {
-            // InternalMenuDsl.g:343:2: ( ruleXAssignment )
-            // InternalMenuDsl.g:344:3: ruleXAssignment
+            // InternalMenuDsl.g:393:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:394:3: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
@@ -1159,11 +1331,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // InternalMenuDsl.g:354:1: entryRuleXAssignment : ruleXAssignment EOF ;
+    // InternalMenuDsl.g:404:1: entryRuleXAssignment : ruleXAssignment EOF ;
     public final void entryRuleXAssignment() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:355:1: ( ruleXAssignment EOF )
-            // InternalMenuDsl.g:356:1: ruleXAssignment EOF
+            // InternalMenuDsl.g:405:1: ( ruleXAssignment EOF )
+            // InternalMenuDsl.g:406:1: ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentRule()); 
@@ -1193,23 +1365,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAssignment"
-    // InternalMenuDsl.g:363:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
+    // InternalMenuDsl.g:413:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
     public final void ruleXAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:367:2: ( ( ( rule__XAssignment__Alternatives ) ) )
-            // InternalMenuDsl.g:368:2: ( ( rule__XAssignment__Alternatives ) )
+            // InternalMenuDsl.g:417:2: ( ( ( rule__XAssignment__Alternatives ) ) )
+            // InternalMenuDsl.g:418:2: ( ( rule__XAssignment__Alternatives ) )
             {
-            // InternalMenuDsl.g:368:2: ( ( rule__XAssignment__Alternatives ) )
-            // InternalMenuDsl.g:369:3: ( rule__XAssignment__Alternatives )
+            // InternalMenuDsl.g:418:2: ( ( rule__XAssignment__Alternatives ) )
+            // InternalMenuDsl.g:419:3: ( rule__XAssignment__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:370:3: ( rule__XAssignment__Alternatives )
-            // InternalMenuDsl.g:370:4: rule__XAssignment__Alternatives
+            // InternalMenuDsl.g:420:3: ( rule__XAssignment__Alternatives )
+            // InternalMenuDsl.g:420:4: rule__XAssignment__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Alternatives();
@@ -1244,11 +1416,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // InternalMenuDsl.g:379:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
+    // InternalMenuDsl.g:429:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
     public final void entryRuleOpSingleAssign() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:380:1: ( ruleOpSingleAssign EOF )
-            // InternalMenuDsl.g:381:1: ruleOpSingleAssign EOF
+            // InternalMenuDsl.g:430:1: ( ruleOpSingleAssign EOF )
+            // InternalMenuDsl.g:431:1: ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignRule()); 
@@ -1278,17 +1450,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // InternalMenuDsl.g:388:1: ruleOpSingleAssign : ( '=' ) ;
+    // InternalMenuDsl.g:438:1: ruleOpSingleAssign : ( '=' ) ;
     public final void ruleOpSingleAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:392:2: ( ( '=' ) )
-            // InternalMenuDsl.g:393:2: ( '=' )
+            // InternalMenuDsl.g:442:2: ( ( '=' ) )
+            // InternalMenuDsl.g:443:2: ( '=' )
             {
-            // InternalMenuDsl.g:393:2: ( '=' )
-            // InternalMenuDsl.g:394:3: '='
+            // InternalMenuDsl.g:443:2: ( '=' )
+            // InternalMenuDsl.g:444:3: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignAccess().getEqualsSignKeyword()); 
@@ -1319,11 +1491,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // InternalMenuDsl.g:404:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
+    // InternalMenuDsl.g:454:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
     public final void entryRuleOpMultiAssign() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:405:1: ( ruleOpMultiAssign EOF )
-            // InternalMenuDsl.g:406:1: ruleOpMultiAssign EOF
+            // InternalMenuDsl.g:455:1: ( ruleOpMultiAssign EOF )
+            // InternalMenuDsl.g:456:1: ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignRule()); 
@@ -1353,23 +1525,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // InternalMenuDsl.g:413:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
+    // InternalMenuDsl.g:463:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
     public final void ruleOpMultiAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:417:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
-            // InternalMenuDsl.g:418:2: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalMenuDsl.g:467:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
+            // InternalMenuDsl.g:468:2: ( ( rule__OpMultiAssign__Alternatives ) )
             {
-            // InternalMenuDsl.g:418:2: ( ( rule__OpMultiAssign__Alternatives ) )
-            // InternalMenuDsl.g:419:3: ( rule__OpMultiAssign__Alternatives )
+            // InternalMenuDsl.g:468:2: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalMenuDsl.g:469:3: ( rule__OpMultiAssign__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:420:3: ( rule__OpMultiAssign__Alternatives )
-            // InternalMenuDsl.g:420:4: rule__OpMultiAssign__Alternatives
+            // InternalMenuDsl.g:470:3: ( rule__OpMultiAssign__Alternatives )
+            // InternalMenuDsl.g:470:4: rule__OpMultiAssign__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Alternatives();
@@ -1404,11 +1576,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // InternalMenuDsl.g:429:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
+    // InternalMenuDsl.g:479:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
     public final void entryRuleXOrExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:430:1: ( ruleXOrExpression EOF )
-            // InternalMenuDsl.g:431:1: ruleXOrExpression EOF
+            // InternalMenuDsl.g:480:1: ( ruleXOrExpression EOF )
+            // InternalMenuDsl.g:481:1: ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionRule()); 
@@ -1438,23 +1610,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // InternalMenuDsl.g:438:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:488:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
     public final void ruleXOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:442:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:443:2: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalMenuDsl.g:492:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:493:2: ( ( rule__XOrExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:443:2: ( ( rule__XOrExpression__Group__0 ) )
-            // InternalMenuDsl.g:444:3: ( rule__XOrExpression__Group__0 )
+            // InternalMenuDsl.g:493:2: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalMenuDsl.g:494:3: ( rule__XOrExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:445:3: ( rule__XOrExpression__Group__0 )
-            // InternalMenuDsl.g:445:4: rule__XOrExpression__Group__0
+            // InternalMenuDsl.g:495:3: ( rule__XOrExpression__Group__0 )
+            // InternalMenuDsl.g:495:4: rule__XOrExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__0();
@@ -1489,11 +1661,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // InternalMenuDsl.g:454:1: entryRuleOpOr : ruleOpOr EOF ;
+    // InternalMenuDsl.g:504:1: entryRuleOpOr : ruleOpOr EOF ;
     public final void entryRuleOpOr() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:455:1: ( ruleOpOr EOF )
-            // InternalMenuDsl.g:456:1: ruleOpOr EOF
+            // InternalMenuDsl.g:505:1: ( ruleOpOr EOF )
+            // InternalMenuDsl.g:506:1: ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrRule()); 
@@ -1523,17 +1695,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpOr"
-    // InternalMenuDsl.g:463:1: ruleOpOr : ( '||' ) ;
+    // InternalMenuDsl.g:513:1: ruleOpOr : ( '||' ) ;
     public final void ruleOpOr() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:467:2: ( ( '||' ) )
-            // InternalMenuDsl.g:468:2: ( '||' )
+            // InternalMenuDsl.g:517:2: ( ( '||' ) )
+            // InternalMenuDsl.g:518:2: ( '||' )
             {
-            // InternalMenuDsl.g:468:2: ( '||' )
-            // InternalMenuDsl.g:469:3: '||'
+            // InternalMenuDsl.g:518:2: ( '||' )
+            // InternalMenuDsl.g:519:3: '||'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrAccess().getVerticalLineVerticalLineKeyword()); 
@@ -1564,11 +1736,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // InternalMenuDsl.g:479:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
+    // InternalMenuDsl.g:529:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
     public final void entryRuleXAndExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:480:1: ( ruleXAndExpression EOF )
-            // InternalMenuDsl.g:481:1: ruleXAndExpression EOF
+            // InternalMenuDsl.g:530:1: ( ruleXAndExpression EOF )
+            // InternalMenuDsl.g:531:1: ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionRule()); 
@@ -1598,23 +1770,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // InternalMenuDsl.g:488:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:538:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
     public final void ruleXAndExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:492:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:493:2: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalMenuDsl.g:542:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:543:2: ( ( rule__XAndExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:493:2: ( ( rule__XAndExpression__Group__0 ) )
-            // InternalMenuDsl.g:494:3: ( rule__XAndExpression__Group__0 )
+            // InternalMenuDsl.g:543:2: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalMenuDsl.g:544:3: ( rule__XAndExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:495:3: ( rule__XAndExpression__Group__0 )
-            // InternalMenuDsl.g:495:4: rule__XAndExpression__Group__0
+            // InternalMenuDsl.g:545:3: ( rule__XAndExpression__Group__0 )
+            // InternalMenuDsl.g:545:4: rule__XAndExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__0();
@@ -1649,11 +1821,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // InternalMenuDsl.g:504:1: entryRuleOpAnd : ruleOpAnd EOF ;
+    // InternalMenuDsl.g:554:1: entryRuleOpAnd : ruleOpAnd EOF ;
     public final void entryRuleOpAnd() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:505:1: ( ruleOpAnd EOF )
-            // InternalMenuDsl.g:506:1: ruleOpAnd EOF
+            // InternalMenuDsl.g:555:1: ( ruleOpAnd EOF )
+            // InternalMenuDsl.g:556:1: ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndRule()); 
@@ -1683,17 +1855,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpAnd"
-    // InternalMenuDsl.g:513:1: ruleOpAnd : ( '&&' ) ;
+    // InternalMenuDsl.g:563:1: ruleOpAnd : ( '&&' ) ;
     public final void ruleOpAnd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:517:2: ( ( '&&' ) )
-            // InternalMenuDsl.g:518:2: ( '&&' )
+            // InternalMenuDsl.g:567:2: ( ( '&&' ) )
+            // InternalMenuDsl.g:568:2: ( '&&' )
             {
-            // InternalMenuDsl.g:518:2: ( '&&' )
-            // InternalMenuDsl.g:519:3: '&&'
+            // InternalMenuDsl.g:568:2: ( '&&' )
+            // InternalMenuDsl.g:569:3: '&&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndAccess().getAmpersandAmpersandKeyword()); 
@@ -1724,11 +1896,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // InternalMenuDsl.g:529:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
+    // InternalMenuDsl.g:579:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
     public final void entryRuleXEqualityExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:530:1: ( ruleXEqualityExpression EOF )
-            // InternalMenuDsl.g:531:1: ruleXEqualityExpression EOF
+            // InternalMenuDsl.g:580:1: ( ruleXEqualityExpression EOF )
+            // InternalMenuDsl.g:581:1: ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionRule()); 
@@ -1758,23 +1930,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // InternalMenuDsl.g:538:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:588:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
     public final void ruleXEqualityExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:542:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:543:2: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalMenuDsl.g:592:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:593:2: ( ( rule__XEqualityExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:543:2: ( ( rule__XEqualityExpression__Group__0 ) )
-            // InternalMenuDsl.g:544:3: ( rule__XEqualityExpression__Group__0 )
+            // InternalMenuDsl.g:593:2: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalMenuDsl.g:594:3: ( rule__XEqualityExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:545:3: ( rule__XEqualityExpression__Group__0 )
-            // InternalMenuDsl.g:545:4: rule__XEqualityExpression__Group__0
+            // InternalMenuDsl.g:595:3: ( rule__XEqualityExpression__Group__0 )
+            // InternalMenuDsl.g:595:4: rule__XEqualityExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__0();
@@ -1809,11 +1981,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // InternalMenuDsl.g:554:1: entryRuleOpEquality : ruleOpEquality EOF ;
+    // InternalMenuDsl.g:604:1: entryRuleOpEquality : ruleOpEquality EOF ;
     public final void entryRuleOpEquality() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:555:1: ( ruleOpEquality EOF )
-            // InternalMenuDsl.g:556:1: ruleOpEquality EOF
+            // InternalMenuDsl.g:605:1: ( ruleOpEquality EOF )
+            // InternalMenuDsl.g:606:1: ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityRule()); 
@@ -1843,23 +2015,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpEquality"
-    // InternalMenuDsl.g:563:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
+    // InternalMenuDsl.g:613:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
     public final void ruleOpEquality() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:567:2: ( ( ( rule__OpEquality__Alternatives ) ) )
-            // InternalMenuDsl.g:568:2: ( ( rule__OpEquality__Alternatives ) )
+            // InternalMenuDsl.g:617:2: ( ( ( rule__OpEquality__Alternatives ) ) )
+            // InternalMenuDsl.g:618:2: ( ( rule__OpEquality__Alternatives ) )
             {
-            // InternalMenuDsl.g:568:2: ( ( rule__OpEquality__Alternatives ) )
-            // InternalMenuDsl.g:569:3: ( rule__OpEquality__Alternatives )
+            // InternalMenuDsl.g:618:2: ( ( rule__OpEquality__Alternatives ) )
+            // InternalMenuDsl.g:619:3: ( rule__OpEquality__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:570:3: ( rule__OpEquality__Alternatives )
-            // InternalMenuDsl.g:570:4: rule__OpEquality__Alternatives
+            // InternalMenuDsl.g:620:3: ( rule__OpEquality__Alternatives )
+            // InternalMenuDsl.g:620:4: rule__OpEquality__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpEquality__Alternatives();
@@ -1894,11 +2066,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // InternalMenuDsl.g:579:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
+    // InternalMenuDsl.g:629:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
     public final void entryRuleXRelationalExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:580:1: ( ruleXRelationalExpression EOF )
-            // InternalMenuDsl.g:581:1: ruleXRelationalExpression EOF
+            // InternalMenuDsl.g:630:1: ( ruleXRelationalExpression EOF )
+            // InternalMenuDsl.g:631:1: ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionRule()); 
@@ -1928,23 +2100,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // InternalMenuDsl.g:588:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:638:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
     public final void ruleXRelationalExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:592:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:593:2: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalMenuDsl.g:642:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:643:2: ( ( rule__XRelationalExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:593:2: ( ( rule__XRelationalExpression__Group__0 ) )
-            // InternalMenuDsl.g:594:3: ( rule__XRelationalExpression__Group__0 )
+            // InternalMenuDsl.g:643:2: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalMenuDsl.g:644:3: ( rule__XRelationalExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:595:3: ( rule__XRelationalExpression__Group__0 )
-            // InternalMenuDsl.g:595:4: rule__XRelationalExpression__Group__0
+            // InternalMenuDsl.g:645:3: ( rule__XRelationalExpression__Group__0 )
+            // InternalMenuDsl.g:645:4: rule__XRelationalExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__0();
@@ -1979,11 +2151,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // InternalMenuDsl.g:604:1: entryRuleOpCompare : ruleOpCompare EOF ;
+    // InternalMenuDsl.g:654:1: entryRuleOpCompare : ruleOpCompare EOF ;
     public final void entryRuleOpCompare() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:605:1: ( ruleOpCompare EOF )
-            // InternalMenuDsl.g:606:1: ruleOpCompare EOF
+            // InternalMenuDsl.g:655:1: ( ruleOpCompare EOF )
+            // InternalMenuDsl.g:656:1: ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareRule()); 
@@ -2013,23 +2185,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpCompare"
-    // InternalMenuDsl.g:613:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
+    // InternalMenuDsl.g:663:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
     public final void ruleOpCompare() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:617:2: ( ( ( rule__OpCompare__Alternatives ) ) )
-            // InternalMenuDsl.g:618:2: ( ( rule__OpCompare__Alternatives ) )
+            // InternalMenuDsl.g:667:2: ( ( ( rule__OpCompare__Alternatives ) ) )
+            // InternalMenuDsl.g:668:2: ( ( rule__OpCompare__Alternatives ) )
             {
-            // InternalMenuDsl.g:618:2: ( ( rule__OpCompare__Alternatives ) )
-            // InternalMenuDsl.g:619:3: ( rule__OpCompare__Alternatives )
+            // InternalMenuDsl.g:668:2: ( ( rule__OpCompare__Alternatives ) )
+            // InternalMenuDsl.g:669:3: ( rule__OpCompare__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:620:3: ( rule__OpCompare__Alternatives )
-            // InternalMenuDsl.g:620:4: rule__OpCompare__Alternatives
+            // InternalMenuDsl.g:670:3: ( rule__OpCompare__Alternatives )
+            // InternalMenuDsl.g:670:4: rule__OpCompare__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpCompare__Alternatives();
@@ -2064,11 +2236,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // InternalMenuDsl.g:629:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
+    // InternalMenuDsl.g:679:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
     public final void entryRuleXOtherOperatorExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:630:1: ( ruleXOtherOperatorExpression EOF )
-            // InternalMenuDsl.g:631:1: ruleXOtherOperatorExpression EOF
+            // InternalMenuDsl.g:680:1: ( ruleXOtherOperatorExpression EOF )
+            // InternalMenuDsl.g:681:1: ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionRule()); 
@@ -2098,23 +2270,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // InternalMenuDsl.g:638:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:688:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
     public final void ruleXOtherOperatorExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:642:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:643:2: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalMenuDsl.g:692:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:693:2: ( ( rule__XOtherOperatorExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:643:2: ( ( rule__XOtherOperatorExpression__Group__0 ) )
-            // InternalMenuDsl.g:644:3: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalMenuDsl.g:693:2: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalMenuDsl.g:694:3: ( rule__XOtherOperatorExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:645:3: ( rule__XOtherOperatorExpression__Group__0 )
-            // InternalMenuDsl.g:645:4: rule__XOtherOperatorExpression__Group__0
+            // InternalMenuDsl.g:695:3: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalMenuDsl.g:695:4: rule__XOtherOperatorExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__0();
@@ -2149,11 +2321,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpOther"
-    // InternalMenuDsl.g:654:1: entryRuleOpOther : ruleOpOther EOF ;
+    // InternalMenuDsl.g:704:1: entryRuleOpOther : ruleOpOther EOF ;
     public final void entryRuleOpOther() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:655:1: ( ruleOpOther EOF )
-            // InternalMenuDsl.g:656:1: ruleOpOther EOF
+            // InternalMenuDsl.g:705:1: ( ruleOpOther EOF )
+            // InternalMenuDsl.g:706:1: ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherRule()); 
@@ -2183,23 +2355,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpOther"
-    // InternalMenuDsl.g:663:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
+    // InternalMenuDsl.g:713:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
     public final void ruleOpOther() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:667:2: ( ( ( rule__OpOther__Alternatives ) ) )
-            // InternalMenuDsl.g:668:2: ( ( rule__OpOther__Alternatives ) )
+            // InternalMenuDsl.g:717:2: ( ( ( rule__OpOther__Alternatives ) ) )
+            // InternalMenuDsl.g:718:2: ( ( rule__OpOther__Alternatives ) )
             {
-            // InternalMenuDsl.g:668:2: ( ( rule__OpOther__Alternatives ) )
-            // InternalMenuDsl.g:669:3: ( rule__OpOther__Alternatives )
+            // InternalMenuDsl.g:718:2: ( ( rule__OpOther__Alternatives ) )
+            // InternalMenuDsl.g:719:3: ( rule__OpOther__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:670:3: ( rule__OpOther__Alternatives )
-            // InternalMenuDsl.g:670:4: rule__OpOther__Alternatives
+            // InternalMenuDsl.g:720:3: ( rule__OpOther__Alternatives )
+            // InternalMenuDsl.g:720:4: rule__OpOther__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives();
@@ -2234,11 +2406,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // InternalMenuDsl.g:679:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
+    // InternalMenuDsl.g:729:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
     public final void entryRuleXAdditiveExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:680:1: ( ruleXAdditiveExpression EOF )
-            // InternalMenuDsl.g:681:1: ruleXAdditiveExpression EOF
+            // InternalMenuDsl.g:730:1: ( ruleXAdditiveExpression EOF )
+            // InternalMenuDsl.g:731:1: ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionRule()); 
@@ -2268,23 +2440,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // InternalMenuDsl.g:688:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:738:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
     public final void ruleXAdditiveExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:692:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:693:2: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalMenuDsl.g:742:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:743:2: ( ( rule__XAdditiveExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:693:2: ( ( rule__XAdditiveExpression__Group__0 ) )
-            // InternalMenuDsl.g:694:3: ( rule__XAdditiveExpression__Group__0 )
+            // InternalMenuDsl.g:743:2: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalMenuDsl.g:744:3: ( rule__XAdditiveExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:695:3: ( rule__XAdditiveExpression__Group__0 )
-            // InternalMenuDsl.g:695:4: rule__XAdditiveExpression__Group__0
+            // InternalMenuDsl.g:745:3: ( rule__XAdditiveExpression__Group__0 )
+            // InternalMenuDsl.g:745:4: rule__XAdditiveExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__0();
@@ -2319,11 +2491,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // InternalMenuDsl.g:704:1: entryRuleOpAdd : ruleOpAdd EOF ;
+    // InternalMenuDsl.g:754:1: entryRuleOpAdd : ruleOpAdd EOF ;
     public final void entryRuleOpAdd() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:705:1: ( ruleOpAdd EOF )
-            // InternalMenuDsl.g:706:1: ruleOpAdd EOF
+            // InternalMenuDsl.g:755:1: ( ruleOpAdd EOF )
+            // InternalMenuDsl.g:756:1: ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddRule()); 
@@ -2353,23 +2525,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpAdd"
-    // InternalMenuDsl.g:713:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
+    // InternalMenuDsl.g:763:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
     public final void ruleOpAdd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:717:2: ( ( ( rule__OpAdd__Alternatives ) ) )
-            // InternalMenuDsl.g:718:2: ( ( rule__OpAdd__Alternatives ) )
+            // InternalMenuDsl.g:767:2: ( ( ( rule__OpAdd__Alternatives ) ) )
+            // InternalMenuDsl.g:768:2: ( ( rule__OpAdd__Alternatives ) )
             {
-            // InternalMenuDsl.g:718:2: ( ( rule__OpAdd__Alternatives ) )
-            // InternalMenuDsl.g:719:3: ( rule__OpAdd__Alternatives )
+            // InternalMenuDsl.g:768:2: ( ( rule__OpAdd__Alternatives ) )
+            // InternalMenuDsl.g:769:3: ( rule__OpAdd__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:720:3: ( rule__OpAdd__Alternatives )
-            // InternalMenuDsl.g:720:4: rule__OpAdd__Alternatives
+            // InternalMenuDsl.g:770:3: ( rule__OpAdd__Alternatives )
+            // InternalMenuDsl.g:770:4: rule__OpAdd__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpAdd__Alternatives();
@@ -2404,11 +2576,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // InternalMenuDsl.g:729:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
+    // InternalMenuDsl.g:779:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
     public final void entryRuleXMultiplicativeExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:730:1: ( ruleXMultiplicativeExpression EOF )
-            // InternalMenuDsl.g:731:1: ruleXMultiplicativeExpression EOF
+            // InternalMenuDsl.g:780:1: ( ruleXMultiplicativeExpression EOF )
+            // InternalMenuDsl.g:781:1: ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionRule()); 
@@ -2438,23 +2610,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // InternalMenuDsl.g:738:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:788:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
     public final void ruleXMultiplicativeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:742:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:743:2: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalMenuDsl.g:792:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:793:2: ( ( rule__XMultiplicativeExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:743:2: ( ( rule__XMultiplicativeExpression__Group__0 ) )
-            // InternalMenuDsl.g:744:3: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalMenuDsl.g:793:2: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalMenuDsl.g:794:3: ( rule__XMultiplicativeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:745:3: ( rule__XMultiplicativeExpression__Group__0 )
-            // InternalMenuDsl.g:745:4: rule__XMultiplicativeExpression__Group__0
+            // InternalMenuDsl.g:795:3: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalMenuDsl.g:795:4: rule__XMultiplicativeExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__0();
@@ -2489,11 +2661,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // InternalMenuDsl.g:754:1: entryRuleOpMulti : ruleOpMulti EOF ;
+    // InternalMenuDsl.g:804:1: entryRuleOpMulti : ruleOpMulti EOF ;
     public final void entryRuleOpMulti() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:755:1: ( ruleOpMulti EOF )
-            // InternalMenuDsl.g:756:1: ruleOpMulti EOF
+            // InternalMenuDsl.g:805:1: ( ruleOpMulti EOF )
+            // InternalMenuDsl.g:806:1: ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiRule()); 
@@ -2523,23 +2695,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpMulti"
-    // InternalMenuDsl.g:763:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
+    // InternalMenuDsl.g:813:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
     public final void ruleOpMulti() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:767:2: ( ( ( rule__OpMulti__Alternatives ) ) )
-            // InternalMenuDsl.g:768:2: ( ( rule__OpMulti__Alternatives ) )
+            // InternalMenuDsl.g:817:2: ( ( ( rule__OpMulti__Alternatives ) ) )
+            // InternalMenuDsl.g:818:2: ( ( rule__OpMulti__Alternatives ) )
             {
-            // InternalMenuDsl.g:768:2: ( ( rule__OpMulti__Alternatives ) )
-            // InternalMenuDsl.g:769:3: ( rule__OpMulti__Alternatives )
+            // InternalMenuDsl.g:818:2: ( ( rule__OpMulti__Alternatives ) )
+            // InternalMenuDsl.g:819:3: ( rule__OpMulti__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:770:3: ( rule__OpMulti__Alternatives )
-            // InternalMenuDsl.g:770:4: rule__OpMulti__Alternatives
+            // InternalMenuDsl.g:820:3: ( rule__OpMulti__Alternatives )
+            // InternalMenuDsl.g:820:4: rule__OpMulti__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpMulti__Alternatives();
@@ -2574,11 +2746,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // InternalMenuDsl.g:779:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
+    // InternalMenuDsl.g:829:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
     public final void entryRuleXUnaryOperation() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:780:1: ( ruleXUnaryOperation EOF )
-            // InternalMenuDsl.g:781:1: ruleXUnaryOperation EOF
+            // InternalMenuDsl.g:830:1: ( ruleXUnaryOperation EOF )
+            // InternalMenuDsl.g:831:1: ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationRule()); 
@@ -2608,23 +2780,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // InternalMenuDsl.g:788:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
+    // InternalMenuDsl.g:838:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
     public final void ruleXUnaryOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:792:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
-            // InternalMenuDsl.g:793:2: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalMenuDsl.g:842:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
+            // InternalMenuDsl.g:843:2: ( ( rule__XUnaryOperation__Alternatives ) )
             {
-            // InternalMenuDsl.g:793:2: ( ( rule__XUnaryOperation__Alternatives ) )
-            // InternalMenuDsl.g:794:3: ( rule__XUnaryOperation__Alternatives )
+            // InternalMenuDsl.g:843:2: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalMenuDsl.g:844:3: ( rule__XUnaryOperation__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:795:3: ( rule__XUnaryOperation__Alternatives )
-            // InternalMenuDsl.g:795:4: rule__XUnaryOperation__Alternatives
+            // InternalMenuDsl.g:845:3: ( rule__XUnaryOperation__Alternatives )
+            // InternalMenuDsl.g:845:4: rule__XUnaryOperation__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Alternatives();
@@ -2659,11 +2831,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // InternalMenuDsl.g:804:1: entryRuleOpUnary : ruleOpUnary EOF ;
+    // InternalMenuDsl.g:854:1: entryRuleOpUnary : ruleOpUnary EOF ;
     public final void entryRuleOpUnary() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:805:1: ( ruleOpUnary EOF )
-            // InternalMenuDsl.g:806:1: ruleOpUnary EOF
+            // InternalMenuDsl.g:855:1: ( ruleOpUnary EOF )
+            // InternalMenuDsl.g:856:1: ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryRule()); 
@@ -2693,23 +2865,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpUnary"
-    // InternalMenuDsl.g:813:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
+    // InternalMenuDsl.g:863:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
     public final void ruleOpUnary() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:817:2: ( ( ( rule__OpUnary__Alternatives ) ) )
-            // InternalMenuDsl.g:818:2: ( ( rule__OpUnary__Alternatives ) )
+            // InternalMenuDsl.g:867:2: ( ( ( rule__OpUnary__Alternatives ) ) )
+            // InternalMenuDsl.g:868:2: ( ( rule__OpUnary__Alternatives ) )
             {
-            // InternalMenuDsl.g:818:2: ( ( rule__OpUnary__Alternatives ) )
-            // InternalMenuDsl.g:819:3: ( rule__OpUnary__Alternatives )
+            // InternalMenuDsl.g:868:2: ( ( rule__OpUnary__Alternatives ) )
+            // InternalMenuDsl.g:869:3: ( rule__OpUnary__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:820:3: ( rule__OpUnary__Alternatives )
-            // InternalMenuDsl.g:820:4: rule__OpUnary__Alternatives
+            // InternalMenuDsl.g:870:3: ( rule__OpUnary__Alternatives )
+            // InternalMenuDsl.g:870:4: rule__OpUnary__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpUnary__Alternatives();
@@ -2744,11 +2916,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // InternalMenuDsl.g:829:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
+    // InternalMenuDsl.g:879:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
     public final void entryRuleXCastedExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:830:1: ( ruleXCastedExpression EOF )
-            // InternalMenuDsl.g:831:1: ruleXCastedExpression EOF
+            // InternalMenuDsl.g:880:1: ( ruleXCastedExpression EOF )
+            // InternalMenuDsl.g:881:1: ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionRule()); 
@@ -2778,23 +2950,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // InternalMenuDsl.g:838:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:888:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
     public final void ruleXCastedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:842:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:843:2: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalMenuDsl.g:892:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:893:2: ( ( rule__XCastedExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:843:2: ( ( rule__XCastedExpression__Group__0 ) )
-            // InternalMenuDsl.g:844:3: ( rule__XCastedExpression__Group__0 )
+            // InternalMenuDsl.g:893:2: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalMenuDsl.g:894:3: ( rule__XCastedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:845:3: ( rule__XCastedExpression__Group__0 )
-            // InternalMenuDsl.g:845:4: rule__XCastedExpression__Group__0
+            // InternalMenuDsl.g:895:3: ( rule__XCastedExpression__Group__0 )
+            // InternalMenuDsl.g:895:4: rule__XCastedExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__0();
@@ -2829,11 +3001,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // InternalMenuDsl.g:854:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
+    // InternalMenuDsl.g:904:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
     public final void entryRuleXPostfixOperation() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:855:1: ( ruleXPostfixOperation EOF )
-            // InternalMenuDsl.g:856:1: ruleXPostfixOperation EOF
+            // InternalMenuDsl.g:905:1: ( ruleXPostfixOperation EOF )
+            // InternalMenuDsl.g:906:1: ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationRule()); 
@@ -2863,23 +3035,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // InternalMenuDsl.g:863:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
+    // InternalMenuDsl.g:913:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
     public final void ruleXPostfixOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:867:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
-            // InternalMenuDsl.g:868:2: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalMenuDsl.g:917:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
+            // InternalMenuDsl.g:918:2: ( ( rule__XPostfixOperation__Group__0 ) )
             {
-            // InternalMenuDsl.g:868:2: ( ( rule__XPostfixOperation__Group__0 ) )
-            // InternalMenuDsl.g:869:3: ( rule__XPostfixOperation__Group__0 )
+            // InternalMenuDsl.g:918:2: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalMenuDsl.g:919:3: ( rule__XPostfixOperation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:870:3: ( rule__XPostfixOperation__Group__0 )
-            // InternalMenuDsl.g:870:4: rule__XPostfixOperation__Group__0
+            // InternalMenuDsl.g:920:3: ( rule__XPostfixOperation__Group__0 )
+            // InternalMenuDsl.g:920:4: rule__XPostfixOperation__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__0();
@@ -2914,11 +3086,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // InternalMenuDsl.g:879:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
+    // InternalMenuDsl.g:929:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
     public final void entryRuleOpPostfix() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:880:1: ( ruleOpPostfix EOF )
-            // InternalMenuDsl.g:881:1: ruleOpPostfix EOF
+            // InternalMenuDsl.g:930:1: ( ruleOpPostfix EOF )
+            // InternalMenuDsl.g:931:1: ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixRule()); 
@@ -2948,23 +3120,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // InternalMenuDsl.g:888:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
+    // InternalMenuDsl.g:938:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
     public final void ruleOpPostfix() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:892:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
-            // InternalMenuDsl.g:893:2: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalMenuDsl.g:942:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
+            // InternalMenuDsl.g:943:2: ( ( rule__OpPostfix__Alternatives ) )
             {
-            // InternalMenuDsl.g:893:2: ( ( rule__OpPostfix__Alternatives ) )
-            // InternalMenuDsl.g:894:3: ( rule__OpPostfix__Alternatives )
+            // InternalMenuDsl.g:943:2: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalMenuDsl.g:944:3: ( rule__OpPostfix__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:895:3: ( rule__OpPostfix__Alternatives )
-            // InternalMenuDsl.g:895:4: rule__OpPostfix__Alternatives
+            // InternalMenuDsl.g:945:3: ( rule__OpPostfix__Alternatives )
+            // InternalMenuDsl.g:945:4: rule__OpPostfix__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__OpPostfix__Alternatives();
@@ -2999,11 +3171,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // InternalMenuDsl.g:904:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
+    // InternalMenuDsl.g:954:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
     public final void entryRuleXMemberFeatureCall() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:905:1: ( ruleXMemberFeatureCall EOF )
-            // InternalMenuDsl.g:906:1: ruleXMemberFeatureCall EOF
+            // InternalMenuDsl.g:955:1: ( ruleXMemberFeatureCall EOF )
+            // InternalMenuDsl.g:956:1: ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallRule()); 
@@ -3033,23 +3205,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // InternalMenuDsl.g:913:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
+    // InternalMenuDsl.g:963:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
     public final void ruleXMemberFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:917:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
-            // InternalMenuDsl.g:918:2: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalMenuDsl.g:967:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
+            // InternalMenuDsl.g:968:2: ( ( rule__XMemberFeatureCall__Group__0 ) )
             {
-            // InternalMenuDsl.g:918:2: ( ( rule__XMemberFeatureCall__Group__0 ) )
-            // InternalMenuDsl.g:919:3: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalMenuDsl.g:968:2: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalMenuDsl.g:969:3: ( rule__XMemberFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:920:3: ( rule__XMemberFeatureCall__Group__0 )
-            // InternalMenuDsl.g:920:4: rule__XMemberFeatureCall__Group__0
+            // InternalMenuDsl.g:970:3: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalMenuDsl.g:970:4: rule__XMemberFeatureCall__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__0();
@@ -3084,11 +3256,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // InternalMenuDsl.g:929:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
+    // InternalMenuDsl.g:979:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
     public final void entryRuleXPrimaryExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:930:1: ( ruleXPrimaryExpression EOF )
-            // InternalMenuDsl.g:931:1: ruleXPrimaryExpression EOF
+            // InternalMenuDsl.g:980:1: ( ruleXPrimaryExpression EOF )
+            // InternalMenuDsl.g:981:1: ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionRule()); 
@@ -3118,23 +3290,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // InternalMenuDsl.g:938:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
+    // InternalMenuDsl.g:988:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
     public final void ruleXPrimaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:942:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
-            // InternalMenuDsl.g:943:2: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalMenuDsl.g:992:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
+            // InternalMenuDsl.g:993:2: ( ( rule__XPrimaryExpression__Alternatives ) )
             {
-            // InternalMenuDsl.g:943:2: ( ( rule__XPrimaryExpression__Alternatives ) )
-            // InternalMenuDsl.g:944:3: ( rule__XPrimaryExpression__Alternatives )
+            // InternalMenuDsl.g:993:2: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalMenuDsl.g:994:3: ( rule__XPrimaryExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:945:3: ( rule__XPrimaryExpression__Alternatives )
-            // InternalMenuDsl.g:945:4: rule__XPrimaryExpression__Alternatives
+            // InternalMenuDsl.g:995:3: ( rule__XPrimaryExpression__Alternatives )
+            // InternalMenuDsl.g:995:4: rule__XPrimaryExpression__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XPrimaryExpression__Alternatives();
@@ -3169,11 +3341,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // InternalMenuDsl.g:954:1: entryRuleXLiteral : ruleXLiteral EOF ;
+    // InternalMenuDsl.g:1004:1: entryRuleXLiteral : ruleXLiteral EOF ;
     public final void entryRuleXLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:955:1: ( ruleXLiteral EOF )
-            // InternalMenuDsl.g:956:1: ruleXLiteral EOF
+            // InternalMenuDsl.g:1005:1: ( ruleXLiteral EOF )
+            // InternalMenuDsl.g:1006:1: ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralRule()); 
@@ -3203,23 +3375,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXLiteral"
-    // InternalMenuDsl.g:963:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
+    // InternalMenuDsl.g:1013:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
     public final void ruleXLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:967:2: ( ( ( rule__XLiteral__Alternatives ) ) )
-            // InternalMenuDsl.g:968:2: ( ( rule__XLiteral__Alternatives ) )
+            // InternalMenuDsl.g:1017:2: ( ( ( rule__XLiteral__Alternatives ) ) )
+            // InternalMenuDsl.g:1018:2: ( ( rule__XLiteral__Alternatives ) )
             {
-            // InternalMenuDsl.g:968:2: ( ( rule__XLiteral__Alternatives ) )
-            // InternalMenuDsl.g:969:3: ( rule__XLiteral__Alternatives )
+            // InternalMenuDsl.g:1018:2: ( ( rule__XLiteral__Alternatives ) )
+            // InternalMenuDsl.g:1019:3: ( rule__XLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:970:3: ( rule__XLiteral__Alternatives )
-            // InternalMenuDsl.g:970:4: rule__XLiteral__Alternatives
+            // InternalMenuDsl.g:1020:3: ( rule__XLiteral__Alternatives )
+            // InternalMenuDsl.g:1020:4: rule__XLiteral__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XLiteral__Alternatives();
@@ -3254,11 +3426,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // InternalMenuDsl.g:979:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
+    // InternalMenuDsl.g:1029:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
     public final void entryRuleXCollectionLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:980:1: ( ruleXCollectionLiteral EOF )
-            // InternalMenuDsl.g:981:1: ruleXCollectionLiteral EOF
+            // InternalMenuDsl.g:1030:1: ( ruleXCollectionLiteral EOF )
+            // InternalMenuDsl.g:1031:1: ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralRule()); 
@@ -3288,23 +3460,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // InternalMenuDsl.g:988:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
+    // InternalMenuDsl.g:1038:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
     public final void ruleXCollectionLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:992:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
-            // InternalMenuDsl.g:993:2: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalMenuDsl.g:1042:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
+            // InternalMenuDsl.g:1043:2: ( ( rule__XCollectionLiteral__Alternatives ) )
             {
-            // InternalMenuDsl.g:993:2: ( ( rule__XCollectionLiteral__Alternatives ) )
-            // InternalMenuDsl.g:994:3: ( rule__XCollectionLiteral__Alternatives )
+            // InternalMenuDsl.g:1043:2: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalMenuDsl.g:1044:3: ( rule__XCollectionLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:995:3: ( rule__XCollectionLiteral__Alternatives )
-            // InternalMenuDsl.g:995:4: rule__XCollectionLiteral__Alternatives
+            // InternalMenuDsl.g:1045:3: ( rule__XCollectionLiteral__Alternatives )
+            // InternalMenuDsl.g:1045:4: rule__XCollectionLiteral__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XCollectionLiteral__Alternatives();
@@ -3339,11 +3511,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // InternalMenuDsl.g:1004:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
+    // InternalMenuDsl.g:1054:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
     public final void entryRuleXSetLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1005:1: ( ruleXSetLiteral EOF )
-            // InternalMenuDsl.g:1006:1: ruleXSetLiteral EOF
+            // InternalMenuDsl.g:1055:1: ( ruleXSetLiteral EOF )
+            // InternalMenuDsl.g:1056:1: ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralRule()); 
@@ -3373,23 +3545,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // InternalMenuDsl.g:1013:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
+    // InternalMenuDsl.g:1063:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
     public final void ruleXSetLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1017:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
-            // InternalMenuDsl.g:1018:2: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1067:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
+            // InternalMenuDsl.g:1068:2: ( ( rule__XSetLiteral__Group__0 ) )
             {
-            // InternalMenuDsl.g:1018:2: ( ( rule__XSetLiteral__Group__0 ) )
-            // InternalMenuDsl.g:1019:3: ( rule__XSetLiteral__Group__0 )
+            // InternalMenuDsl.g:1068:2: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1069:3: ( rule__XSetLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1020:3: ( rule__XSetLiteral__Group__0 )
-            // InternalMenuDsl.g:1020:4: rule__XSetLiteral__Group__0
+            // InternalMenuDsl.g:1070:3: ( rule__XSetLiteral__Group__0 )
+            // InternalMenuDsl.g:1070:4: rule__XSetLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__0();
@@ -3424,11 +3596,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // InternalMenuDsl.g:1029:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
+    // InternalMenuDsl.g:1079:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
     public final void entryRuleXListLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1030:1: ( ruleXListLiteral EOF )
-            // InternalMenuDsl.g:1031:1: ruleXListLiteral EOF
+            // InternalMenuDsl.g:1080:1: ( ruleXListLiteral EOF )
+            // InternalMenuDsl.g:1081:1: ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralRule()); 
@@ -3458,23 +3630,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // InternalMenuDsl.g:1038:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
+    // InternalMenuDsl.g:1088:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
     public final void ruleXListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1042:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
-            // InternalMenuDsl.g:1043:2: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1092:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
+            // InternalMenuDsl.g:1093:2: ( ( rule__XListLiteral__Group__0 ) )
             {
-            // InternalMenuDsl.g:1043:2: ( ( rule__XListLiteral__Group__0 ) )
-            // InternalMenuDsl.g:1044:3: ( rule__XListLiteral__Group__0 )
+            // InternalMenuDsl.g:1093:2: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1094:3: ( rule__XListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1045:3: ( rule__XListLiteral__Group__0 )
-            // InternalMenuDsl.g:1045:4: rule__XListLiteral__Group__0
+            // InternalMenuDsl.g:1095:3: ( rule__XListLiteral__Group__0 )
+            // InternalMenuDsl.g:1095:4: rule__XListLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__0();
@@ -3509,11 +3681,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // InternalMenuDsl.g:1054:1: entryRuleXClosure : ruleXClosure EOF ;
+    // InternalMenuDsl.g:1104:1: entryRuleXClosure : ruleXClosure EOF ;
     public final void entryRuleXClosure() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1055:1: ( ruleXClosure EOF )
-            // InternalMenuDsl.g:1056:1: ruleXClosure EOF
+            // InternalMenuDsl.g:1105:1: ( ruleXClosure EOF )
+            // InternalMenuDsl.g:1106:1: ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureRule()); 
@@ -3543,23 +3715,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXClosure"
-    // InternalMenuDsl.g:1063:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
+    // InternalMenuDsl.g:1113:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
     public final void ruleXClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1067:2: ( ( ( rule__XClosure__Group__0 ) ) )
-            // InternalMenuDsl.g:1068:2: ( ( rule__XClosure__Group__0 ) )
+            // InternalMenuDsl.g:1117:2: ( ( ( rule__XClosure__Group__0 ) ) )
+            // InternalMenuDsl.g:1118:2: ( ( rule__XClosure__Group__0 ) )
             {
-            // InternalMenuDsl.g:1068:2: ( ( rule__XClosure__Group__0 ) )
-            // InternalMenuDsl.g:1069:3: ( rule__XClosure__Group__0 )
+            // InternalMenuDsl.g:1118:2: ( ( rule__XClosure__Group__0 ) )
+            // InternalMenuDsl.g:1119:3: ( rule__XClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1070:3: ( rule__XClosure__Group__0 )
-            // InternalMenuDsl.g:1070:4: rule__XClosure__Group__0
+            // InternalMenuDsl.g:1120:3: ( rule__XClosure__Group__0 )
+            // InternalMenuDsl.g:1120:4: rule__XClosure__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group__0();
@@ -3594,11 +3766,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // InternalMenuDsl.g:1079:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
+    // InternalMenuDsl.g:1129:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
     public final void entryRuleXExpressionInClosure() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1080:1: ( ruleXExpressionInClosure EOF )
-            // InternalMenuDsl.g:1081:1: ruleXExpressionInClosure EOF
+            // InternalMenuDsl.g:1130:1: ( ruleXExpressionInClosure EOF )
+            // InternalMenuDsl.g:1131:1: ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureRule()); 
@@ -3628,23 +3800,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // InternalMenuDsl.g:1088:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
+    // InternalMenuDsl.g:1138:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
     public final void ruleXExpressionInClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1092:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
-            // InternalMenuDsl.g:1093:2: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalMenuDsl.g:1142:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
+            // InternalMenuDsl.g:1143:2: ( ( rule__XExpressionInClosure__Group__0 ) )
             {
-            // InternalMenuDsl.g:1093:2: ( ( rule__XExpressionInClosure__Group__0 ) )
-            // InternalMenuDsl.g:1094:3: ( rule__XExpressionInClosure__Group__0 )
+            // InternalMenuDsl.g:1143:2: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalMenuDsl.g:1144:3: ( rule__XExpressionInClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1095:3: ( rule__XExpressionInClosure__Group__0 )
-            // InternalMenuDsl.g:1095:4: rule__XExpressionInClosure__Group__0
+            // InternalMenuDsl.g:1145:3: ( rule__XExpressionInClosure__Group__0 )
+            // InternalMenuDsl.g:1145:4: rule__XExpressionInClosure__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__0();
@@ -3679,11 +3851,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // InternalMenuDsl.g:1104:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
+    // InternalMenuDsl.g:1154:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
     public final void entryRuleXShortClosure() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1105:1: ( ruleXShortClosure EOF )
-            // InternalMenuDsl.g:1106:1: ruleXShortClosure EOF
+            // InternalMenuDsl.g:1155:1: ( ruleXShortClosure EOF )
+            // InternalMenuDsl.g:1156:1: ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureRule()); 
@@ -3713,23 +3885,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // InternalMenuDsl.g:1113:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
+    // InternalMenuDsl.g:1163:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
     public final void ruleXShortClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1117:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
-            // InternalMenuDsl.g:1118:2: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalMenuDsl.g:1167:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
+            // InternalMenuDsl.g:1168:2: ( ( rule__XShortClosure__Group__0 ) )
             {
-            // InternalMenuDsl.g:1118:2: ( ( rule__XShortClosure__Group__0 ) )
-            // InternalMenuDsl.g:1119:3: ( rule__XShortClosure__Group__0 )
+            // InternalMenuDsl.g:1168:2: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalMenuDsl.g:1169:3: ( rule__XShortClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1120:3: ( rule__XShortClosure__Group__0 )
-            // InternalMenuDsl.g:1120:4: rule__XShortClosure__Group__0
+            // InternalMenuDsl.g:1170:3: ( rule__XShortClosure__Group__0 )
+            // InternalMenuDsl.g:1170:4: rule__XShortClosure__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__0();
@@ -3764,11 +3936,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // InternalMenuDsl.g:1129:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
+    // InternalMenuDsl.g:1179:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
     public final void entryRuleXParenthesizedExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1130:1: ( ruleXParenthesizedExpression EOF )
-            // InternalMenuDsl.g:1131:1: ruleXParenthesizedExpression EOF
+            // InternalMenuDsl.g:1180:1: ( ruleXParenthesizedExpression EOF )
+            // InternalMenuDsl.g:1181:1: ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionRule()); 
@@ -3798,23 +3970,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // InternalMenuDsl.g:1138:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1188:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
     public final void ruleXParenthesizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1142:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1143:2: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalMenuDsl.g:1192:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1193:2: ( ( rule__XParenthesizedExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1143:2: ( ( rule__XParenthesizedExpression__Group__0 ) )
-            // InternalMenuDsl.g:1144:3: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalMenuDsl.g:1193:2: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalMenuDsl.g:1194:3: ( rule__XParenthesizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1145:3: ( rule__XParenthesizedExpression__Group__0 )
-            // InternalMenuDsl.g:1145:4: rule__XParenthesizedExpression__Group__0
+            // InternalMenuDsl.g:1195:3: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalMenuDsl.g:1195:4: rule__XParenthesizedExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__0();
@@ -3849,11 +4021,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // InternalMenuDsl.g:1154:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
+    // InternalMenuDsl.g:1204:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
     public final void entryRuleXIfExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1155:1: ( ruleXIfExpression EOF )
-            // InternalMenuDsl.g:1156:1: ruleXIfExpression EOF
+            // InternalMenuDsl.g:1205:1: ( ruleXIfExpression EOF )
+            // InternalMenuDsl.g:1206:1: ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionRule()); 
@@ -3883,23 +4055,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // InternalMenuDsl.g:1163:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1213:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
     public final void ruleXIfExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1167:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1168:2: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalMenuDsl.g:1217:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1218:2: ( ( rule__XIfExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1168:2: ( ( rule__XIfExpression__Group__0 ) )
-            // InternalMenuDsl.g:1169:3: ( rule__XIfExpression__Group__0 )
+            // InternalMenuDsl.g:1218:2: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalMenuDsl.g:1219:3: ( rule__XIfExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1170:3: ( rule__XIfExpression__Group__0 )
-            // InternalMenuDsl.g:1170:4: rule__XIfExpression__Group__0
+            // InternalMenuDsl.g:1220:3: ( rule__XIfExpression__Group__0 )
+            // InternalMenuDsl.g:1220:4: rule__XIfExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__0();
@@ -3934,11 +4106,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // InternalMenuDsl.g:1179:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
+    // InternalMenuDsl.g:1229:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
     public final void entryRuleXSwitchExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1180:1: ( ruleXSwitchExpression EOF )
-            // InternalMenuDsl.g:1181:1: ruleXSwitchExpression EOF
+            // InternalMenuDsl.g:1230:1: ( ruleXSwitchExpression EOF )
+            // InternalMenuDsl.g:1231:1: ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionRule()); 
@@ -3968,23 +4140,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // InternalMenuDsl.g:1188:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1238:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
     public final void ruleXSwitchExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1192:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1193:2: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalMenuDsl.g:1242:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1243:2: ( ( rule__XSwitchExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1193:2: ( ( rule__XSwitchExpression__Group__0 ) )
-            // InternalMenuDsl.g:1194:3: ( rule__XSwitchExpression__Group__0 )
+            // InternalMenuDsl.g:1243:2: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalMenuDsl.g:1244:3: ( rule__XSwitchExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1195:3: ( rule__XSwitchExpression__Group__0 )
-            // InternalMenuDsl.g:1195:4: rule__XSwitchExpression__Group__0
+            // InternalMenuDsl.g:1245:3: ( rule__XSwitchExpression__Group__0 )
+            // InternalMenuDsl.g:1245:4: rule__XSwitchExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__0();
@@ -4019,11 +4191,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // InternalMenuDsl.g:1204:1: entryRuleXCasePart : ruleXCasePart EOF ;
+    // InternalMenuDsl.g:1254:1: entryRuleXCasePart : ruleXCasePart EOF ;
     public final void entryRuleXCasePart() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1205:1: ( ruleXCasePart EOF )
-            // InternalMenuDsl.g:1206:1: ruleXCasePart EOF
+            // InternalMenuDsl.g:1255:1: ( ruleXCasePart EOF )
+            // InternalMenuDsl.g:1256:1: ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartRule()); 
@@ -4053,23 +4225,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXCasePart"
-    // InternalMenuDsl.g:1213:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
+    // InternalMenuDsl.g:1263:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
     public final void ruleXCasePart() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1217:2: ( ( ( rule__XCasePart__Group__0 ) ) )
-            // InternalMenuDsl.g:1218:2: ( ( rule__XCasePart__Group__0 ) )
+            // InternalMenuDsl.g:1267:2: ( ( ( rule__XCasePart__Group__0 ) ) )
+            // InternalMenuDsl.g:1268:2: ( ( rule__XCasePart__Group__0 ) )
             {
-            // InternalMenuDsl.g:1218:2: ( ( rule__XCasePart__Group__0 ) )
-            // InternalMenuDsl.g:1219:3: ( rule__XCasePart__Group__0 )
+            // InternalMenuDsl.g:1268:2: ( ( rule__XCasePart__Group__0 ) )
+            // InternalMenuDsl.g:1269:3: ( rule__XCasePart__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1220:3: ( rule__XCasePart__Group__0 )
-            // InternalMenuDsl.g:1220:4: rule__XCasePart__Group__0
+            // InternalMenuDsl.g:1270:3: ( rule__XCasePart__Group__0 )
+            // InternalMenuDsl.g:1270:4: rule__XCasePart__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Group__0();
@@ -4104,11 +4276,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // InternalMenuDsl.g:1229:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
+    // InternalMenuDsl.g:1279:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
     public final void entryRuleXForLoopExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1230:1: ( ruleXForLoopExpression EOF )
-            // InternalMenuDsl.g:1231:1: ruleXForLoopExpression EOF
+            // InternalMenuDsl.g:1280:1: ( ruleXForLoopExpression EOF )
+            // InternalMenuDsl.g:1281:1: ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionRule()); 
@@ -4138,23 +4310,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // InternalMenuDsl.g:1238:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1288:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
     public final void ruleXForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1242:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1243:2: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalMenuDsl.g:1292:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1293:2: ( ( rule__XForLoopExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1243:2: ( ( rule__XForLoopExpression__Group__0 ) )
-            // InternalMenuDsl.g:1244:3: ( rule__XForLoopExpression__Group__0 )
+            // InternalMenuDsl.g:1293:2: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalMenuDsl.g:1294:3: ( rule__XForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1245:3: ( rule__XForLoopExpression__Group__0 )
-            // InternalMenuDsl.g:1245:4: rule__XForLoopExpression__Group__0
+            // InternalMenuDsl.g:1295:3: ( rule__XForLoopExpression__Group__0 )
+            // InternalMenuDsl.g:1295:4: rule__XForLoopExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__0();
@@ -4189,11 +4361,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // InternalMenuDsl.g:1254:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
+    // InternalMenuDsl.g:1304:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
     public final void entryRuleXBasicForLoopExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1255:1: ( ruleXBasicForLoopExpression EOF )
-            // InternalMenuDsl.g:1256:1: ruleXBasicForLoopExpression EOF
+            // InternalMenuDsl.g:1305:1: ( ruleXBasicForLoopExpression EOF )
+            // InternalMenuDsl.g:1306:1: ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionRule()); 
@@ -4223,23 +4395,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // InternalMenuDsl.g:1263:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1313:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
     public final void ruleXBasicForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1267:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1268:2: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalMenuDsl.g:1317:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1318:2: ( ( rule__XBasicForLoopExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1268:2: ( ( rule__XBasicForLoopExpression__Group__0 ) )
-            // InternalMenuDsl.g:1269:3: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalMenuDsl.g:1318:2: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalMenuDsl.g:1319:3: ( rule__XBasicForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1270:3: ( rule__XBasicForLoopExpression__Group__0 )
-            // InternalMenuDsl.g:1270:4: rule__XBasicForLoopExpression__Group__0
+            // InternalMenuDsl.g:1320:3: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalMenuDsl.g:1320:4: rule__XBasicForLoopExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__0();
@@ -4274,11 +4446,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // InternalMenuDsl.g:1279:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
+    // InternalMenuDsl.g:1329:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
     public final void entryRuleXWhileExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1280:1: ( ruleXWhileExpression EOF )
-            // InternalMenuDsl.g:1281:1: ruleXWhileExpression EOF
+            // InternalMenuDsl.g:1330:1: ( ruleXWhileExpression EOF )
+            // InternalMenuDsl.g:1331:1: ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionRule()); 
@@ -4308,23 +4480,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // InternalMenuDsl.g:1288:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1338:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
     public final void ruleXWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1292:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1293:2: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalMenuDsl.g:1342:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1343:2: ( ( rule__XWhileExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1293:2: ( ( rule__XWhileExpression__Group__0 ) )
-            // InternalMenuDsl.g:1294:3: ( rule__XWhileExpression__Group__0 )
+            // InternalMenuDsl.g:1343:2: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalMenuDsl.g:1344:3: ( rule__XWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1295:3: ( rule__XWhileExpression__Group__0 )
-            // InternalMenuDsl.g:1295:4: rule__XWhileExpression__Group__0
+            // InternalMenuDsl.g:1345:3: ( rule__XWhileExpression__Group__0 )
+            // InternalMenuDsl.g:1345:4: rule__XWhileExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__0();
@@ -4359,11 +4531,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // InternalMenuDsl.g:1304:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
+    // InternalMenuDsl.g:1354:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
     public final void entryRuleXDoWhileExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1305:1: ( ruleXDoWhileExpression EOF )
-            // InternalMenuDsl.g:1306:1: ruleXDoWhileExpression EOF
+            // InternalMenuDsl.g:1355:1: ( ruleXDoWhileExpression EOF )
+            // InternalMenuDsl.g:1356:1: ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionRule()); 
@@ -4393,23 +4565,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // InternalMenuDsl.g:1313:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1363:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
     public final void ruleXDoWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1317:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1318:2: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalMenuDsl.g:1367:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1368:2: ( ( rule__XDoWhileExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1318:2: ( ( rule__XDoWhileExpression__Group__0 ) )
-            // InternalMenuDsl.g:1319:3: ( rule__XDoWhileExpression__Group__0 )
+            // InternalMenuDsl.g:1368:2: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalMenuDsl.g:1369:3: ( rule__XDoWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1320:3: ( rule__XDoWhileExpression__Group__0 )
-            // InternalMenuDsl.g:1320:4: rule__XDoWhileExpression__Group__0
+            // InternalMenuDsl.g:1370:3: ( rule__XDoWhileExpression__Group__0 )
+            // InternalMenuDsl.g:1370:4: rule__XDoWhileExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__0();
@@ -4444,11 +4616,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // InternalMenuDsl.g:1329:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
+    // InternalMenuDsl.g:1379:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
     public final void entryRuleXBlockExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1330:1: ( ruleXBlockExpression EOF )
-            // InternalMenuDsl.g:1331:1: ruleXBlockExpression EOF
+            // InternalMenuDsl.g:1380:1: ( ruleXBlockExpression EOF )
+            // InternalMenuDsl.g:1381:1: ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionRule()); 
@@ -4478,23 +4650,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // InternalMenuDsl.g:1338:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1388:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
     public final void ruleXBlockExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1342:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1343:2: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalMenuDsl.g:1392:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1393:2: ( ( rule__XBlockExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1343:2: ( ( rule__XBlockExpression__Group__0 ) )
-            // InternalMenuDsl.g:1344:3: ( rule__XBlockExpression__Group__0 )
+            // InternalMenuDsl.g:1393:2: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalMenuDsl.g:1394:3: ( rule__XBlockExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1345:3: ( rule__XBlockExpression__Group__0 )
-            // InternalMenuDsl.g:1345:4: rule__XBlockExpression__Group__0
+            // InternalMenuDsl.g:1395:3: ( rule__XBlockExpression__Group__0 )
+            // InternalMenuDsl.g:1395:4: rule__XBlockExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__0();
@@ -4529,11 +4701,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // InternalMenuDsl.g:1354:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
+    // InternalMenuDsl.g:1404:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
     public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1355:1: ( ruleXExpressionOrVarDeclaration EOF )
-            // InternalMenuDsl.g:1356:1: ruleXExpressionOrVarDeclaration EOF
+            // InternalMenuDsl.g:1405:1: ( ruleXExpressionOrVarDeclaration EOF )
+            // InternalMenuDsl.g:1406:1: ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationRule()); 
@@ -4563,23 +4735,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // InternalMenuDsl.g:1363:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
+    // InternalMenuDsl.g:1413:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
     public final void ruleXExpressionOrVarDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1367:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
-            // InternalMenuDsl.g:1368:2: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalMenuDsl.g:1417:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
+            // InternalMenuDsl.g:1418:2: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
             {
-            // InternalMenuDsl.g:1368:2: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
-            // InternalMenuDsl.g:1369:3: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalMenuDsl.g:1418:2: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalMenuDsl.g:1419:3: ( rule__XExpressionOrVarDeclaration__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:1370:3: ( rule__XExpressionOrVarDeclaration__Alternatives )
-            // InternalMenuDsl.g:1370:4: rule__XExpressionOrVarDeclaration__Alternatives
+            // InternalMenuDsl.g:1420:3: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalMenuDsl.g:1420:4: rule__XExpressionOrVarDeclaration__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionOrVarDeclaration__Alternatives();
@@ -4614,11 +4786,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // InternalMenuDsl.g:1379:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
+    // InternalMenuDsl.g:1429:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
     public final void entryRuleXVariableDeclaration() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1380:1: ( ruleXVariableDeclaration EOF )
-            // InternalMenuDsl.g:1381:1: ruleXVariableDeclaration EOF
+            // InternalMenuDsl.g:1430:1: ( ruleXVariableDeclaration EOF )
+            // InternalMenuDsl.g:1431:1: ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationRule()); 
@@ -4648,23 +4820,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // InternalMenuDsl.g:1388:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
+    // InternalMenuDsl.g:1438:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
     public final void ruleXVariableDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1392:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
-            // InternalMenuDsl.g:1393:2: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalMenuDsl.g:1442:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
+            // InternalMenuDsl.g:1443:2: ( ( rule__XVariableDeclaration__Group__0 ) )
             {
-            // InternalMenuDsl.g:1393:2: ( ( rule__XVariableDeclaration__Group__0 ) )
-            // InternalMenuDsl.g:1394:3: ( rule__XVariableDeclaration__Group__0 )
+            // InternalMenuDsl.g:1443:2: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalMenuDsl.g:1444:3: ( rule__XVariableDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1395:3: ( rule__XVariableDeclaration__Group__0 )
-            // InternalMenuDsl.g:1395:4: rule__XVariableDeclaration__Group__0
+            // InternalMenuDsl.g:1445:3: ( rule__XVariableDeclaration__Group__0 )
+            // InternalMenuDsl.g:1445:4: rule__XVariableDeclaration__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__0();
@@ -4699,11 +4871,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // InternalMenuDsl.g:1404:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
+    // InternalMenuDsl.g:1454:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
     public final void entryRuleJvmFormalParameter() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1405:1: ( ruleJvmFormalParameter EOF )
-            // InternalMenuDsl.g:1406:1: ruleJvmFormalParameter EOF
+            // InternalMenuDsl.g:1455:1: ( ruleJvmFormalParameter EOF )
+            // InternalMenuDsl.g:1456:1: ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterRule()); 
@@ -4733,23 +4905,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // InternalMenuDsl.g:1413:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
+    // InternalMenuDsl.g:1463:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
     public final void ruleJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1417:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
-            // InternalMenuDsl.g:1418:2: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalMenuDsl.g:1467:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
+            // InternalMenuDsl.g:1468:2: ( ( rule__JvmFormalParameter__Group__0 ) )
             {
-            // InternalMenuDsl.g:1418:2: ( ( rule__JvmFormalParameter__Group__0 ) )
-            // InternalMenuDsl.g:1419:3: ( rule__JvmFormalParameter__Group__0 )
+            // InternalMenuDsl.g:1468:2: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalMenuDsl.g:1469:3: ( rule__JvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1420:3: ( rule__JvmFormalParameter__Group__0 )
-            // InternalMenuDsl.g:1420:4: rule__JvmFormalParameter__Group__0
+            // InternalMenuDsl.g:1470:3: ( rule__JvmFormalParameter__Group__0 )
+            // InternalMenuDsl.g:1470:4: rule__JvmFormalParameter__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__0();
@@ -4784,11 +4956,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // InternalMenuDsl.g:1429:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
+    // InternalMenuDsl.g:1479:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
     public final void entryRuleFullJvmFormalParameter() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1430:1: ( ruleFullJvmFormalParameter EOF )
-            // InternalMenuDsl.g:1431:1: ruleFullJvmFormalParameter EOF
+            // InternalMenuDsl.g:1480:1: ( ruleFullJvmFormalParameter EOF )
+            // InternalMenuDsl.g:1481:1: ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterRule()); 
@@ -4818,23 +4990,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // InternalMenuDsl.g:1438:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
+    // InternalMenuDsl.g:1488:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
     public final void ruleFullJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1442:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
-            // InternalMenuDsl.g:1443:2: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalMenuDsl.g:1492:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
+            // InternalMenuDsl.g:1493:2: ( ( rule__FullJvmFormalParameter__Group__0 ) )
             {
-            // InternalMenuDsl.g:1443:2: ( ( rule__FullJvmFormalParameter__Group__0 ) )
-            // InternalMenuDsl.g:1444:3: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalMenuDsl.g:1493:2: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalMenuDsl.g:1494:3: ( rule__FullJvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1445:3: ( rule__FullJvmFormalParameter__Group__0 )
-            // InternalMenuDsl.g:1445:4: rule__FullJvmFormalParameter__Group__0
+            // InternalMenuDsl.g:1495:3: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalMenuDsl.g:1495:4: rule__FullJvmFormalParameter__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__0();
@@ -4869,11 +5041,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // InternalMenuDsl.g:1454:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
+    // InternalMenuDsl.g:1504:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
     public final void entryRuleXFeatureCall() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1455:1: ( ruleXFeatureCall EOF )
-            // InternalMenuDsl.g:1456:1: ruleXFeatureCall EOF
+            // InternalMenuDsl.g:1505:1: ( ruleXFeatureCall EOF )
+            // InternalMenuDsl.g:1506:1: ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallRule()); 
@@ -4903,23 +5075,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // InternalMenuDsl.g:1463:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
+    // InternalMenuDsl.g:1513:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
     public final void ruleXFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1467:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
-            // InternalMenuDsl.g:1468:2: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalMenuDsl.g:1517:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
+            // InternalMenuDsl.g:1518:2: ( ( rule__XFeatureCall__Group__0 ) )
             {
-            // InternalMenuDsl.g:1468:2: ( ( rule__XFeatureCall__Group__0 ) )
-            // InternalMenuDsl.g:1469:3: ( rule__XFeatureCall__Group__0 )
+            // InternalMenuDsl.g:1518:2: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalMenuDsl.g:1519:3: ( rule__XFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1470:3: ( rule__XFeatureCall__Group__0 )
-            // InternalMenuDsl.g:1470:4: rule__XFeatureCall__Group__0
+            // InternalMenuDsl.g:1520:3: ( rule__XFeatureCall__Group__0 )
+            // InternalMenuDsl.g:1520:4: rule__XFeatureCall__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__0();
@@ -4954,11 +5126,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // InternalMenuDsl.g:1479:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
+    // InternalMenuDsl.g:1529:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
     public final void entryRuleFeatureCallID() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1480:1: ( ruleFeatureCallID EOF )
-            // InternalMenuDsl.g:1481:1: ruleFeatureCallID EOF
+            // InternalMenuDsl.g:1530:1: ( ruleFeatureCallID EOF )
+            // InternalMenuDsl.g:1531:1: ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDRule()); 
@@ -4988,23 +5160,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // InternalMenuDsl.g:1488:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
+    // InternalMenuDsl.g:1538:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
     public final void ruleFeatureCallID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1492:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
-            // InternalMenuDsl.g:1493:2: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalMenuDsl.g:1542:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
+            // InternalMenuDsl.g:1543:2: ( ( rule__FeatureCallID__Alternatives ) )
             {
-            // InternalMenuDsl.g:1493:2: ( ( rule__FeatureCallID__Alternatives ) )
-            // InternalMenuDsl.g:1494:3: ( rule__FeatureCallID__Alternatives )
+            // InternalMenuDsl.g:1543:2: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalMenuDsl.g:1544:3: ( rule__FeatureCallID__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:1495:3: ( rule__FeatureCallID__Alternatives )
-            // InternalMenuDsl.g:1495:4: rule__FeatureCallID__Alternatives
+            // InternalMenuDsl.g:1545:3: ( rule__FeatureCallID__Alternatives )
+            // InternalMenuDsl.g:1545:4: rule__FeatureCallID__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__FeatureCallID__Alternatives();
@@ -5039,11 +5211,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // InternalMenuDsl.g:1504:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
+    // InternalMenuDsl.g:1554:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
     public final void entryRuleIdOrSuper() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1505:1: ( ruleIdOrSuper EOF )
-            // InternalMenuDsl.g:1506:1: ruleIdOrSuper EOF
+            // InternalMenuDsl.g:1555:1: ( ruleIdOrSuper EOF )
+            // InternalMenuDsl.g:1556:1: ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperRule()); 
@@ -5073,23 +5245,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // InternalMenuDsl.g:1513:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
+    // InternalMenuDsl.g:1563:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
     public final void ruleIdOrSuper() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1517:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
-            // InternalMenuDsl.g:1518:2: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalMenuDsl.g:1567:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
+            // InternalMenuDsl.g:1568:2: ( ( rule__IdOrSuper__Alternatives ) )
             {
-            // InternalMenuDsl.g:1518:2: ( ( rule__IdOrSuper__Alternatives ) )
-            // InternalMenuDsl.g:1519:3: ( rule__IdOrSuper__Alternatives )
+            // InternalMenuDsl.g:1568:2: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalMenuDsl.g:1569:3: ( rule__IdOrSuper__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:1520:3: ( rule__IdOrSuper__Alternatives )
-            // InternalMenuDsl.g:1520:4: rule__IdOrSuper__Alternatives
+            // InternalMenuDsl.g:1570:3: ( rule__IdOrSuper__Alternatives )
+            // InternalMenuDsl.g:1570:4: rule__IdOrSuper__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__IdOrSuper__Alternatives();
@@ -5124,11 +5296,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // InternalMenuDsl.g:1529:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
+    // InternalMenuDsl.g:1579:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
     public final void entryRuleXConstructorCall() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1530:1: ( ruleXConstructorCall EOF )
-            // InternalMenuDsl.g:1531:1: ruleXConstructorCall EOF
+            // InternalMenuDsl.g:1580:1: ( ruleXConstructorCall EOF )
+            // InternalMenuDsl.g:1581:1: ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallRule()); 
@@ -5158,23 +5330,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // InternalMenuDsl.g:1538:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
+    // InternalMenuDsl.g:1588:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
     public final void ruleXConstructorCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1542:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
-            // InternalMenuDsl.g:1543:2: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalMenuDsl.g:1592:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
+            // InternalMenuDsl.g:1593:2: ( ( rule__XConstructorCall__Group__0 ) )
             {
-            // InternalMenuDsl.g:1543:2: ( ( rule__XConstructorCall__Group__0 ) )
-            // InternalMenuDsl.g:1544:3: ( rule__XConstructorCall__Group__0 )
+            // InternalMenuDsl.g:1593:2: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalMenuDsl.g:1594:3: ( rule__XConstructorCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1545:3: ( rule__XConstructorCall__Group__0 )
-            // InternalMenuDsl.g:1545:4: rule__XConstructorCall__Group__0
+            // InternalMenuDsl.g:1595:3: ( rule__XConstructorCall__Group__0 )
+            // InternalMenuDsl.g:1595:4: rule__XConstructorCall__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__0();
@@ -5209,11 +5381,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // InternalMenuDsl.g:1554:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
+    // InternalMenuDsl.g:1604:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
     public final void entryRuleXBooleanLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1555:1: ( ruleXBooleanLiteral EOF )
-            // InternalMenuDsl.g:1556:1: ruleXBooleanLiteral EOF
+            // InternalMenuDsl.g:1605:1: ( ruleXBooleanLiteral EOF )
+            // InternalMenuDsl.g:1606:1: ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralRule()); 
@@ -5243,23 +5415,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // InternalMenuDsl.g:1563:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
+    // InternalMenuDsl.g:1613:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
     public final void ruleXBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1567:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
-            // InternalMenuDsl.g:1568:2: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1617:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
+            // InternalMenuDsl.g:1618:2: ( ( rule__XBooleanLiteral__Group__0 ) )
             {
-            // InternalMenuDsl.g:1568:2: ( ( rule__XBooleanLiteral__Group__0 ) )
-            // InternalMenuDsl.g:1569:3: ( rule__XBooleanLiteral__Group__0 )
+            // InternalMenuDsl.g:1618:2: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1619:3: ( rule__XBooleanLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1570:3: ( rule__XBooleanLiteral__Group__0 )
-            // InternalMenuDsl.g:1570:4: rule__XBooleanLiteral__Group__0
+            // InternalMenuDsl.g:1620:3: ( rule__XBooleanLiteral__Group__0 )
+            // InternalMenuDsl.g:1620:4: rule__XBooleanLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__0();
@@ -5294,11 +5466,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // InternalMenuDsl.g:1579:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
+    // InternalMenuDsl.g:1629:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
     public final void entryRuleXNullLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1580:1: ( ruleXNullLiteral EOF )
-            // InternalMenuDsl.g:1581:1: ruleXNullLiteral EOF
+            // InternalMenuDsl.g:1630:1: ( ruleXNullLiteral EOF )
+            // InternalMenuDsl.g:1631:1: ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralRule()); 
@@ -5328,23 +5500,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // InternalMenuDsl.g:1588:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
+    // InternalMenuDsl.g:1638:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
     public final void ruleXNullLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1592:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
-            // InternalMenuDsl.g:1593:2: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1642:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
+            // InternalMenuDsl.g:1643:2: ( ( rule__XNullLiteral__Group__0 ) )
             {
-            // InternalMenuDsl.g:1593:2: ( ( rule__XNullLiteral__Group__0 ) )
-            // InternalMenuDsl.g:1594:3: ( rule__XNullLiteral__Group__0 )
+            // InternalMenuDsl.g:1643:2: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1644:3: ( rule__XNullLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1595:3: ( rule__XNullLiteral__Group__0 )
-            // InternalMenuDsl.g:1595:4: rule__XNullLiteral__Group__0
+            // InternalMenuDsl.g:1645:3: ( rule__XNullLiteral__Group__0 )
+            // InternalMenuDsl.g:1645:4: rule__XNullLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__0();
@@ -5379,11 +5551,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // InternalMenuDsl.g:1604:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
+    // InternalMenuDsl.g:1654:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
     public final void entryRuleXNumberLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1605:1: ( ruleXNumberLiteral EOF )
-            // InternalMenuDsl.g:1606:1: ruleXNumberLiteral EOF
+            // InternalMenuDsl.g:1655:1: ( ruleXNumberLiteral EOF )
+            // InternalMenuDsl.g:1656:1: ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralRule()); 
@@ -5413,23 +5585,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // InternalMenuDsl.g:1613:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
+    // InternalMenuDsl.g:1663:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
     public final void ruleXNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1617:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
-            // InternalMenuDsl.g:1618:2: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1667:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
+            // InternalMenuDsl.g:1668:2: ( ( rule__XNumberLiteral__Group__0 ) )
             {
-            // InternalMenuDsl.g:1618:2: ( ( rule__XNumberLiteral__Group__0 ) )
-            // InternalMenuDsl.g:1619:3: ( rule__XNumberLiteral__Group__0 )
+            // InternalMenuDsl.g:1668:2: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1669:3: ( rule__XNumberLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1620:3: ( rule__XNumberLiteral__Group__0 )
-            // InternalMenuDsl.g:1620:4: rule__XNumberLiteral__Group__0
+            // InternalMenuDsl.g:1670:3: ( rule__XNumberLiteral__Group__0 )
+            // InternalMenuDsl.g:1670:4: rule__XNumberLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__0();
@@ -5464,11 +5636,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // InternalMenuDsl.g:1629:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
+    // InternalMenuDsl.g:1679:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
     public final void entryRuleXStringLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1630:1: ( ruleXStringLiteral EOF )
-            // InternalMenuDsl.g:1631:1: ruleXStringLiteral EOF
+            // InternalMenuDsl.g:1680:1: ( ruleXStringLiteral EOF )
+            // InternalMenuDsl.g:1681:1: ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralRule()); 
@@ -5498,23 +5670,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // InternalMenuDsl.g:1638:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
+    // InternalMenuDsl.g:1688:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
     public final void ruleXStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1642:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
-            // InternalMenuDsl.g:1643:2: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1692:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
+            // InternalMenuDsl.g:1693:2: ( ( rule__XStringLiteral__Group__0 ) )
             {
-            // InternalMenuDsl.g:1643:2: ( ( rule__XStringLiteral__Group__0 ) )
-            // InternalMenuDsl.g:1644:3: ( rule__XStringLiteral__Group__0 )
+            // InternalMenuDsl.g:1693:2: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1694:3: ( rule__XStringLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1645:3: ( rule__XStringLiteral__Group__0 )
-            // InternalMenuDsl.g:1645:4: rule__XStringLiteral__Group__0
+            // InternalMenuDsl.g:1695:3: ( rule__XStringLiteral__Group__0 )
+            // InternalMenuDsl.g:1695:4: rule__XStringLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__0();
@@ -5549,11 +5721,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // InternalMenuDsl.g:1654:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
+    // InternalMenuDsl.g:1704:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
     public final void entryRuleXTypeLiteral() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1655:1: ( ruleXTypeLiteral EOF )
-            // InternalMenuDsl.g:1656:1: ruleXTypeLiteral EOF
+            // InternalMenuDsl.g:1705:1: ( ruleXTypeLiteral EOF )
+            // InternalMenuDsl.g:1706:1: ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralRule()); 
@@ -5583,23 +5755,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // InternalMenuDsl.g:1663:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
+    // InternalMenuDsl.g:1713:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
     public final void ruleXTypeLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1667:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
-            // InternalMenuDsl.g:1668:2: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1717:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
+            // InternalMenuDsl.g:1718:2: ( ( rule__XTypeLiteral__Group__0 ) )
             {
-            // InternalMenuDsl.g:1668:2: ( ( rule__XTypeLiteral__Group__0 ) )
-            // InternalMenuDsl.g:1669:3: ( rule__XTypeLiteral__Group__0 )
+            // InternalMenuDsl.g:1718:2: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalMenuDsl.g:1719:3: ( rule__XTypeLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1670:3: ( rule__XTypeLiteral__Group__0 )
-            // InternalMenuDsl.g:1670:4: rule__XTypeLiteral__Group__0
+            // InternalMenuDsl.g:1720:3: ( rule__XTypeLiteral__Group__0 )
+            // InternalMenuDsl.g:1720:4: rule__XTypeLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__0();
@@ -5634,11 +5806,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // InternalMenuDsl.g:1679:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
+    // InternalMenuDsl.g:1729:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
     public final void entryRuleXThrowExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1680:1: ( ruleXThrowExpression EOF )
-            // InternalMenuDsl.g:1681:1: ruleXThrowExpression EOF
+            // InternalMenuDsl.g:1730:1: ( ruleXThrowExpression EOF )
+            // InternalMenuDsl.g:1731:1: ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionRule()); 
@@ -5668,23 +5840,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // InternalMenuDsl.g:1688:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1738:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
     public final void ruleXThrowExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1692:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1693:2: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalMenuDsl.g:1742:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1743:2: ( ( rule__XThrowExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1693:2: ( ( rule__XThrowExpression__Group__0 ) )
-            // InternalMenuDsl.g:1694:3: ( rule__XThrowExpression__Group__0 )
+            // InternalMenuDsl.g:1743:2: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalMenuDsl.g:1744:3: ( rule__XThrowExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1695:3: ( rule__XThrowExpression__Group__0 )
-            // InternalMenuDsl.g:1695:4: rule__XThrowExpression__Group__0
+            // InternalMenuDsl.g:1745:3: ( rule__XThrowExpression__Group__0 )
+            // InternalMenuDsl.g:1745:4: rule__XThrowExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__0();
@@ -5719,11 +5891,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // InternalMenuDsl.g:1704:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
+    // InternalMenuDsl.g:1754:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
     public final void entryRuleXReturnExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1705:1: ( ruleXReturnExpression EOF )
-            // InternalMenuDsl.g:1706:1: ruleXReturnExpression EOF
+            // InternalMenuDsl.g:1755:1: ( ruleXReturnExpression EOF )
+            // InternalMenuDsl.g:1756:1: ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionRule()); 
@@ -5753,23 +5925,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // InternalMenuDsl.g:1713:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1763:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
     public final void ruleXReturnExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1717:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1718:2: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalMenuDsl.g:1767:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1768:2: ( ( rule__XReturnExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1718:2: ( ( rule__XReturnExpression__Group__0 ) )
-            // InternalMenuDsl.g:1719:3: ( rule__XReturnExpression__Group__0 )
+            // InternalMenuDsl.g:1768:2: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalMenuDsl.g:1769:3: ( rule__XReturnExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1720:3: ( rule__XReturnExpression__Group__0 )
-            // InternalMenuDsl.g:1720:4: rule__XReturnExpression__Group__0
+            // InternalMenuDsl.g:1770:3: ( rule__XReturnExpression__Group__0 )
+            // InternalMenuDsl.g:1770:4: rule__XReturnExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__0();
@@ -5804,11 +5976,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // InternalMenuDsl.g:1729:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
+    // InternalMenuDsl.g:1779:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
     public final void entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1730:1: ( ruleXTryCatchFinallyExpression EOF )
-            // InternalMenuDsl.g:1731:1: ruleXTryCatchFinallyExpression EOF
+            // InternalMenuDsl.g:1780:1: ( ruleXTryCatchFinallyExpression EOF )
+            // InternalMenuDsl.g:1781:1: ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionRule()); 
@@ -5838,23 +6010,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // InternalMenuDsl.g:1738:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1788:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
     public final void ruleXTryCatchFinallyExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1742:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1743:2: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalMenuDsl.g:1792:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1793:2: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1743:2: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
-            // InternalMenuDsl.g:1744:3: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalMenuDsl.g:1793:2: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalMenuDsl.g:1794:3: ( rule__XTryCatchFinallyExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1745:3: ( rule__XTryCatchFinallyExpression__Group__0 )
-            // InternalMenuDsl.g:1745:4: rule__XTryCatchFinallyExpression__Group__0
+            // InternalMenuDsl.g:1795:3: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalMenuDsl.g:1795:4: rule__XTryCatchFinallyExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__0();
@@ -5889,11 +6061,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // InternalMenuDsl.g:1754:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
+    // InternalMenuDsl.g:1804:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
     public final void entryRuleXSynchronizedExpression() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1755:1: ( ruleXSynchronizedExpression EOF )
-            // InternalMenuDsl.g:1756:1: ruleXSynchronizedExpression EOF
+            // InternalMenuDsl.g:1805:1: ( ruleXSynchronizedExpression EOF )
+            // InternalMenuDsl.g:1806:1: ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionRule()); 
@@ -5923,23 +6095,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // InternalMenuDsl.g:1763:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
+    // InternalMenuDsl.g:1813:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
     public final void ruleXSynchronizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1767:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
-            // InternalMenuDsl.g:1768:2: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalMenuDsl.g:1817:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
+            // InternalMenuDsl.g:1818:2: ( ( rule__XSynchronizedExpression__Group__0 ) )
             {
-            // InternalMenuDsl.g:1768:2: ( ( rule__XSynchronizedExpression__Group__0 ) )
-            // InternalMenuDsl.g:1769:3: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalMenuDsl.g:1818:2: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalMenuDsl.g:1819:3: ( rule__XSynchronizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1770:3: ( rule__XSynchronizedExpression__Group__0 )
-            // InternalMenuDsl.g:1770:4: rule__XSynchronizedExpression__Group__0
+            // InternalMenuDsl.g:1820:3: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalMenuDsl.g:1820:4: rule__XSynchronizedExpression__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__0();
@@ -5974,11 +6146,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // InternalMenuDsl.g:1779:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
+    // InternalMenuDsl.g:1829:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
     public final void entryRuleXCatchClause() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1780:1: ( ruleXCatchClause EOF )
-            // InternalMenuDsl.g:1781:1: ruleXCatchClause EOF
+            // InternalMenuDsl.g:1830:1: ( ruleXCatchClause EOF )
+            // InternalMenuDsl.g:1831:1: ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseRule()); 
@@ -6008,23 +6180,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // InternalMenuDsl.g:1788:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
+    // InternalMenuDsl.g:1838:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
     public final void ruleXCatchClause() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1792:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
-            // InternalMenuDsl.g:1793:2: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalMenuDsl.g:1842:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
+            // InternalMenuDsl.g:1843:2: ( ( rule__XCatchClause__Group__0 ) )
             {
-            // InternalMenuDsl.g:1793:2: ( ( rule__XCatchClause__Group__0 ) )
-            // InternalMenuDsl.g:1794:3: ( rule__XCatchClause__Group__0 )
+            // InternalMenuDsl.g:1843:2: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalMenuDsl.g:1844:3: ( rule__XCatchClause__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1795:3: ( rule__XCatchClause__Group__0 )
-            // InternalMenuDsl.g:1795:4: rule__XCatchClause__Group__0
+            // InternalMenuDsl.g:1845:3: ( rule__XCatchClause__Group__0 )
+            // InternalMenuDsl.g:1845:4: rule__XCatchClause__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__0();
@@ -6059,11 +6231,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalMenuDsl.g:1804:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalMenuDsl.g:1854:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1805:1: ( ruleQualifiedName EOF )
-            // InternalMenuDsl.g:1806:1: ruleQualifiedName EOF
+            // InternalMenuDsl.g:1855:1: ( ruleQualifiedName EOF )
+            // InternalMenuDsl.g:1856:1: ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameRule()); 
@@ -6093,23 +6265,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalMenuDsl.g:1813:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
+    // InternalMenuDsl.g:1863:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1817:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
-            // InternalMenuDsl.g:1818:2: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalMenuDsl.g:1867:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
+            // InternalMenuDsl.g:1868:2: ( ( rule__QualifiedName__Group__0 ) )
             {
-            // InternalMenuDsl.g:1818:2: ( ( rule__QualifiedName__Group__0 ) )
-            // InternalMenuDsl.g:1819:3: ( rule__QualifiedName__Group__0 )
+            // InternalMenuDsl.g:1868:2: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalMenuDsl.g:1869:3: ( rule__QualifiedName__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1820:3: ( rule__QualifiedName__Group__0 )
-            // InternalMenuDsl.g:1820:4: rule__QualifiedName__Group__0
+            // InternalMenuDsl.g:1870:3: ( rule__QualifiedName__Group__0 )
+            // InternalMenuDsl.g:1870:4: rule__QualifiedName__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__0();
@@ -6144,14 +6316,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNumber"
-    // InternalMenuDsl.g:1829:1: entryRuleNumber : ruleNumber EOF ;
+    // InternalMenuDsl.g:1879:1: entryRuleNumber : ruleNumber EOF ;
     public final void entryRuleNumber() throws RecognitionException {
          
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // InternalMenuDsl.g:1833:1: ( ruleNumber EOF )
-            // InternalMenuDsl.g:1834:1: ruleNumber EOF
+            // InternalMenuDsl.g:1883:1: ( ruleNumber EOF )
+            // InternalMenuDsl.g:1884:1: ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberRule()); 
@@ -6184,24 +6356,24 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNumber"
-    // InternalMenuDsl.g:1844:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
+    // InternalMenuDsl.g:1894:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
     public final void ruleNumber() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1849:2: ( ( ( rule__Number__Alternatives ) ) )
-            // InternalMenuDsl.g:1850:2: ( ( rule__Number__Alternatives ) )
+            // InternalMenuDsl.g:1899:2: ( ( ( rule__Number__Alternatives ) ) )
+            // InternalMenuDsl.g:1900:2: ( ( rule__Number__Alternatives ) )
             {
-            // InternalMenuDsl.g:1850:2: ( ( rule__Number__Alternatives ) )
-            // InternalMenuDsl.g:1851:3: ( rule__Number__Alternatives )
+            // InternalMenuDsl.g:1900:2: ( ( rule__Number__Alternatives ) )
+            // InternalMenuDsl.g:1901:3: ( rule__Number__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:1852:3: ( rule__Number__Alternatives )
-            // InternalMenuDsl.g:1852:4: rule__Number__Alternatives
+            // InternalMenuDsl.g:1902:3: ( rule__Number__Alternatives )
+            // InternalMenuDsl.g:1902:4: rule__Number__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__Number__Alternatives();
@@ -6237,11 +6409,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // InternalMenuDsl.g:1862:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
+    // InternalMenuDsl.g:1912:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
     public final void entryRuleJvmTypeReference() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1863:1: ( ruleJvmTypeReference EOF )
-            // InternalMenuDsl.g:1864:1: ruleJvmTypeReference EOF
+            // InternalMenuDsl.g:1913:1: ( ruleJvmTypeReference EOF )
+            // InternalMenuDsl.g:1914:1: ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceRule()); 
@@ -6271,23 +6443,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // InternalMenuDsl.g:1871:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
+    // InternalMenuDsl.g:1921:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
     public final void ruleJvmTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1875:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
-            // InternalMenuDsl.g:1876:2: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalMenuDsl.g:1925:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
+            // InternalMenuDsl.g:1926:2: ( ( rule__JvmTypeReference__Alternatives ) )
             {
-            // InternalMenuDsl.g:1876:2: ( ( rule__JvmTypeReference__Alternatives ) )
-            // InternalMenuDsl.g:1877:3: ( rule__JvmTypeReference__Alternatives )
+            // InternalMenuDsl.g:1926:2: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalMenuDsl.g:1927:3: ( rule__JvmTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:1878:3: ( rule__JvmTypeReference__Alternatives )
-            // InternalMenuDsl.g:1878:4: rule__JvmTypeReference__Alternatives
+            // InternalMenuDsl.g:1928:3: ( rule__JvmTypeReference__Alternatives )
+            // InternalMenuDsl.g:1928:4: rule__JvmTypeReference__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Alternatives();
@@ -6322,11 +6494,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // InternalMenuDsl.g:1887:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
+    // InternalMenuDsl.g:1937:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
     public final void entryRuleArrayBrackets() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1888:1: ( ruleArrayBrackets EOF )
-            // InternalMenuDsl.g:1889:1: ruleArrayBrackets EOF
+            // InternalMenuDsl.g:1938:1: ( ruleArrayBrackets EOF )
+            // InternalMenuDsl.g:1939:1: ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsRule()); 
@@ -6356,23 +6528,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // InternalMenuDsl.g:1896:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
+    // InternalMenuDsl.g:1946:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
     public final void ruleArrayBrackets() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1900:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
-            // InternalMenuDsl.g:1901:2: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalMenuDsl.g:1950:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
+            // InternalMenuDsl.g:1951:2: ( ( rule__ArrayBrackets__Group__0 ) )
             {
-            // InternalMenuDsl.g:1901:2: ( ( rule__ArrayBrackets__Group__0 ) )
-            // InternalMenuDsl.g:1902:3: ( rule__ArrayBrackets__Group__0 )
+            // InternalMenuDsl.g:1951:2: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalMenuDsl.g:1952:3: ( rule__ArrayBrackets__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1903:3: ( rule__ArrayBrackets__Group__0 )
-            // InternalMenuDsl.g:1903:4: rule__ArrayBrackets__Group__0
+            // InternalMenuDsl.g:1953:3: ( rule__ArrayBrackets__Group__0 )
+            // InternalMenuDsl.g:1953:4: rule__ArrayBrackets__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__0();
@@ -6407,11 +6579,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // InternalMenuDsl.g:1912:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
+    // InternalMenuDsl.g:1962:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
     public final void entryRuleXFunctionTypeRef() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1913:1: ( ruleXFunctionTypeRef EOF )
-            // InternalMenuDsl.g:1914:1: ruleXFunctionTypeRef EOF
+            // InternalMenuDsl.g:1963:1: ( ruleXFunctionTypeRef EOF )
+            // InternalMenuDsl.g:1964:1: ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefRule()); 
@@ -6441,23 +6613,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // InternalMenuDsl.g:1921:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
+    // InternalMenuDsl.g:1971:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
     public final void ruleXFunctionTypeRef() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1925:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
-            // InternalMenuDsl.g:1926:2: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalMenuDsl.g:1975:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
+            // InternalMenuDsl.g:1976:2: ( ( rule__XFunctionTypeRef__Group__0 ) )
             {
-            // InternalMenuDsl.g:1926:2: ( ( rule__XFunctionTypeRef__Group__0 ) )
-            // InternalMenuDsl.g:1927:3: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalMenuDsl.g:1976:2: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalMenuDsl.g:1977:3: ( rule__XFunctionTypeRef__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1928:3: ( rule__XFunctionTypeRef__Group__0 )
-            // InternalMenuDsl.g:1928:4: rule__XFunctionTypeRef__Group__0
+            // InternalMenuDsl.g:1978:3: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalMenuDsl.g:1978:4: rule__XFunctionTypeRef__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__0();
@@ -6492,11 +6664,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // InternalMenuDsl.g:1937:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
+    // InternalMenuDsl.g:1987:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
     public final void entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1938:1: ( ruleJvmParameterizedTypeReference EOF )
-            // InternalMenuDsl.g:1939:1: ruleJvmParameterizedTypeReference EOF
+            // InternalMenuDsl.g:1988:1: ( ruleJvmParameterizedTypeReference EOF )
+            // InternalMenuDsl.g:1989:1: ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
@@ -6526,23 +6698,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // InternalMenuDsl.g:1946:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
+    // InternalMenuDsl.g:1996:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
     public final void ruleJvmParameterizedTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1950:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
-            // InternalMenuDsl.g:1951:2: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalMenuDsl.g:2000:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
+            // InternalMenuDsl.g:2001:2: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
             {
-            // InternalMenuDsl.g:1951:2: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
-            // InternalMenuDsl.g:1952:3: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalMenuDsl.g:2001:2: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalMenuDsl.g:2002:3: ( rule__JvmParameterizedTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:1953:3: ( rule__JvmParameterizedTypeReference__Group__0 )
-            // InternalMenuDsl.g:1953:4: rule__JvmParameterizedTypeReference__Group__0
+            // InternalMenuDsl.g:2003:3: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalMenuDsl.g:2003:4: rule__JvmParameterizedTypeReference__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__0();
@@ -6577,11 +6749,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // InternalMenuDsl.g:1962:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
+    // InternalMenuDsl.g:2012:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
     public final void entryRuleJvmArgumentTypeReference() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1963:1: ( ruleJvmArgumentTypeReference EOF )
-            // InternalMenuDsl.g:1964:1: ruleJvmArgumentTypeReference EOF
+            // InternalMenuDsl.g:2013:1: ( ruleJvmArgumentTypeReference EOF )
+            // InternalMenuDsl.g:2014:1: ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceRule()); 
@@ -6611,23 +6783,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // InternalMenuDsl.g:1971:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
+    // InternalMenuDsl.g:2021:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
     public final void ruleJvmArgumentTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:1975:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
-            // InternalMenuDsl.g:1976:2: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalMenuDsl.g:2025:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
+            // InternalMenuDsl.g:2026:2: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
             {
-            // InternalMenuDsl.g:1976:2: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
-            // InternalMenuDsl.g:1977:3: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalMenuDsl.g:2026:2: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalMenuDsl.g:2027:3: ( rule__JvmArgumentTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceAccess().getAlternatives()); 
             }
-            // InternalMenuDsl.g:1978:3: ( rule__JvmArgumentTypeReference__Alternatives )
-            // InternalMenuDsl.g:1978:4: rule__JvmArgumentTypeReference__Alternatives
+            // InternalMenuDsl.g:2028:3: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalMenuDsl.g:2028:4: rule__JvmArgumentTypeReference__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__JvmArgumentTypeReference__Alternatives();
@@ -6662,11 +6834,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // InternalMenuDsl.g:1987:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
+    // InternalMenuDsl.g:2037:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
     public final void entryRuleJvmWildcardTypeReference() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:1988:1: ( ruleJvmWildcardTypeReference EOF )
-            // InternalMenuDsl.g:1989:1: ruleJvmWildcardTypeReference EOF
+            // InternalMenuDsl.g:2038:1: ( ruleJvmWildcardTypeReference EOF )
+            // InternalMenuDsl.g:2039:1: ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceRule()); 
@@ -6696,23 +6868,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // InternalMenuDsl.g:1996:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
+    // InternalMenuDsl.g:2046:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
     public final void ruleJvmWildcardTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2000:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
-            // InternalMenuDsl.g:2001:2: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalMenuDsl.g:2050:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
+            // InternalMenuDsl.g:2051:2: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
             {
-            // InternalMenuDsl.g:2001:2: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
-            // InternalMenuDsl.g:2002:3: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalMenuDsl.g:2051:2: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalMenuDsl.g:2052:3: ( rule__JvmWildcardTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2003:3: ( rule__JvmWildcardTypeReference__Group__0 )
-            // InternalMenuDsl.g:2003:4: rule__JvmWildcardTypeReference__Group__0
+            // InternalMenuDsl.g:2053:3: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalMenuDsl.g:2053:4: rule__JvmWildcardTypeReference__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__0();
@@ -6747,11 +6919,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // InternalMenuDsl.g:2012:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
+    // InternalMenuDsl.g:2062:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
     public final void entryRuleJvmUpperBound() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2013:1: ( ruleJvmUpperBound EOF )
-            // InternalMenuDsl.g:2014:1: ruleJvmUpperBound EOF
+            // InternalMenuDsl.g:2063:1: ( ruleJvmUpperBound EOF )
+            // InternalMenuDsl.g:2064:1: ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundRule()); 
@@ -6781,23 +6953,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // InternalMenuDsl.g:2021:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
+    // InternalMenuDsl.g:2071:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
     public final void ruleJvmUpperBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2025:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
-            // InternalMenuDsl.g:2026:2: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalMenuDsl.g:2075:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
+            // InternalMenuDsl.g:2076:2: ( ( rule__JvmUpperBound__Group__0 ) )
             {
-            // InternalMenuDsl.g:2026:2: ( ( rule__JvmUpperBound__Group__0 ) )
-            // InternalMenuDsl.g:2027:3: ( rule__JvmUpperBound__Group__0 )
+            // InternalMenuDsl.g:2076:2: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalMenuDsl.g:2077:3: ( rule__JvmUpperBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2028:3: ( rule__JvmUpperBound__Group__0 )
-            // InternalMenuDsl.g:2028:4: rule__JvmUpperBound__Group__0
+            // InternalMenuDsl.g:2078:3: ( rule__JvmUpperBound__Group__0 )
+            // InternalMenuDsl.g:2078:4: rule__JvmUpperBound__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__0();
@@ -6832,11 +7004,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // InternalMenuDsl.g:2037:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
+    // InternalMenuDsl.g:2087:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
     public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2038:1: ( ruleJvmUpperBoundAnded EOF )
-            // InternalMenuDsl.g:2039:1: ruleJvmUpperBoundAnded EOF
+            // InternalMenuDsl.g:2088:1: ( ruleJvmUpperBoundAnded EOF )
+            // InternalMenuDsl.g:2089:1: ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedRule()); 
@@ -6866,23 +7038,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // InternalMenuDsl.g:2046:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
+    // InternalMenuDsl.g:2096:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
     public final void ruleJvmUpperBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2050:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
-            // InternalMenuDsl.g:2051:2: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalMenuDsl.g:2100:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
+            // InternalMenuDsl.g:2101:2: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
             {
-            // InternalMenuDsl.g:2051:2: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
-            // InternalMenuDsl.g:2052:3: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalMenuDsl.g:2101:2: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalMenuDsl.g:2102:3: ( rule__JvmUpperBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2053:3: ( rule__JvmUpperBoundAnded__Group__0 )
-            // InternalMenuDsl.g:2053:4: rule__JvmUpperBoundAnded__Group__0
+            // InternalMenuDsl.g:2103:3: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalMenuDsl.g:2103:4: rule__JvmUpperBoundAnded__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__0();
@@ -6917,11 +7089,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // InternalMenuDsl.g:2062:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
+    // InternalMenuDsl.g:2112:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
     public final void entryRuleJvmLowerBound() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2063:1: ( ruleJvmLowerBound EOF )
-            // InternalMenuDsl.g:2064:1: ruleJvmLowerBound EOF
+            // InternalMenuDsl.g:2113:1: ( ruleJvmLowerBound EOF )
+            // InternalMenuDsl.g:2114:1: ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundRule()); 
@@ -6951,23 +7123,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // InternalMenuDsl.g:2071:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
+    // InternalMenuDsl.g:2121:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
     public final void ruleJvmLowerBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2075:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
-            // InternalMenuDsl.g:2076:2: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalMenuDsl.g:2125:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
+            // InternalMenuDsl.g:2126:2: ( ( rule__JvmLowerBound__Group__0 ) )
             {
-            // InternalMenuDsl.g:2076:2: ( ( rule__JvmLowerBound__Group__0 ) )
-            // InternalMenuDsl.g:2077:3: ( rule__JvmLowerBound__Group__0 )
+            // InternalMenuDsl.g:2126:2: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalMenuDsl.g:2127:3: ( rule__JvmLowerBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2078:3: ( rule__JvmLowerBound__Group__0 )
-            // InternalMenuDsl.g:2078:4: rule__JvmLowerBound__Group__0
+            // InternalMenuDsl.g:2128:3: ( rule__JvmLowerBound__Group__0 )
+            // InternalMenuDsl.g:2128:4: rule__JvmLowerBound__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__0();
@@ -7002,11 +7174,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // InternalMenuDsl.g:2087:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
+    // InternalMenuDsl.g:2137:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
     public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2088:1: ( ruleJvmLowerBoundAnded EOF )
-            // InternalMenuDsl.g:2089:1: ruleJvmLowerBoundAnded EOF
+            // InternalMenuDsl.g:2138:1: ( ruleJvmLowerBoundAnded EOF )
+            // InternalMenuDsl.g:2139:1: ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedRule()); 
@@ -7036,23 +7208,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // InternalMenuDsl.g:2096:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
+    // InternalMenuDsl.g:2146:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
     public final void ruleJvmLowerBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2100:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
-            // InternalMenuDsl.g:2101:2: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalMenuDsl.g:2150:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
+            // InternalMenuDsl.g:2151:2: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
             {
-            // InternalMenuDsl.g:2101:2: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
-            // InternalMenuDsl.g:2102:3: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalMenuDsl.g:2151:2: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalMenuDsl.g:2152:3: ( rule__JvmLowerBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2103:3: ( rule__JvmLowerBoundAnded__Group__0 )
-            // InternalMenuDsl.g:2103:4: rule__JvmLowerBoundAnded__Group__0
+            // InternalMenuDsl.g:2153:3: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalMenuDsl.g:2153:4: rule__JvmLowerBoundAnded__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__0();
@@ -7087,11 +7259,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // InternalMenuDsl.g:2112:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
+    // InternalMenuDsl.g:2162:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
     public final void entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2113:1: ( ruleQualifiedNameWithWildcard EOF )
-            // InternalMenuDsl.g:2114:1: ruleQualifiedNameWithWildcard EOF
+            // InternalMenuDsl.g:2163:1: ( ruleQualifiedNameWithWildcard EOF )
+            // InternalMenuDsl.g:2164:1: ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardRule()); 
@@ -7121,23 +7293,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // InternalMenuDsl.g:2121:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
+    // InternalMenuDsl.g:2171:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
     public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2125:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
-            // InternalMenuDsl.g:2126:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalMenuDsl.g:2175:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
+            // InternalMenuDsl.g:2176:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
             {
-            // InternalMenuDsl.g:2126:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
-            // InternalMenuDsl.g:2127:3: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalMenuDsl.g:2176:2: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalMenuDsl.g:2177:3: ( rule__QualifiedNameWithWildcard__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2128:3: ( rule__QualifiedNameWithWildcard__Group__0 )
-            // InternalMenuDsl.g:2128:4: rule__QualifiedNameWithWildcard__Group__0
+            // InternalMenuDsl.g:2178:3: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalMenuDsl.g:2178:4: rule__QualifiedNameWithWildcard__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__0();
@@ -7172,11 +7344,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleValidID"
-    // InternalMenuDsl.g:2137:1: entryRuleValidID : ruleValidID EOF ;
+    // InternalMenuDsl.g:2187:1: entryRuleValidID : ruleValidID EOF ;
     public final void entryRuleValidID() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2138:1: ( ruleValidID EOF )
-            // InternalMenuDsl.g:2139:1: ruleValidID EOF
+            // InternalMenuDsl.g:2188:1: ( ruleValidID EOF )
+            // InternalMenuDsl.g:2189:1: ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDRule()); 
@@ -7206,17 +7378,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleValidID"
-    // InternalMenuDsl.g:2146:1: ruleValidID : ( RULE_ID ) ;
+    // InternalMenuDsl.g:2196:1: ruleValidID : ( RULE_ID ) ;
     public final void ruleValidID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2150:2: ( ( RULE_ID ) )
-            // InternalMenuDsl.g:2151:2: ( RULE_ID )
+            // InternalMenuDsl.g:2200:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:2201:2: ( RULE_ID )
             {
-            // InternalMenuDsl.g:2151:2: ( RULE_ID )
-            // InternalMenuDsl.g:2152:3: RULE_ID
+            // InternalMenuDsl.g:2201:2: ( RULE_ID )
+            // InternalMenuDsl.g:2202:3: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDAccess().getIDTerminalRuleCall()); 
@@ -7247,11 +7419,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleXImportSection"
-    // InternalMenuDsl.g:2162:1: entryRuleXImportSection : ruleXImportSection EOF ;
+    // InternalMenuDsl.g:2212:1: entryRuleXImportSection : ruleXImportSection EOF ;
     public final void entryRuleXImportSection() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2163:1: ( ruleXImportSection EOF )
-            // InternalMenuDsl.g:2164:1: ruleXImportSection EOF
+            // InternalMenuDsl.g:2213:1: ( ruleXImportSection EOF )
+            // InternalMenuDsl.g:2214:1: ruleXImportSection EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionRule()); 
@@ -7281,26 +7453,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleXImportSection"
-    // InternalMenuDsl.g:2171:1: ruleXImportSection : ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) ) ;
+    // InternalMenuDsl.g:2221:1: ruleXImportSection : ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) ) ;
     public final void ruleXImportSection() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2175:2: ( ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) ) )
-            // InternalMenuDsl.g:2176:2: ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) )
+            // InternalMenuDsl.g:2225:2: ( ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) ) )
+            // InternalMenuDsl.g:2226:2: ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) )
             {
-            // InternalMenuDsl.g:2176:2: ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) )
-            // InternalMenuDsl.g:2177:3: ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* )
+            // InternalMenuDsl.g:2226:2: ( ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* ) )
+            // InternalMenuDsl.g:2227:3: ( ( rule__XImportSection__ImportDeclarationsAssignment ) ) ( ( rule__XImportSection__ImportDeclarationsAssignment )* )
             {
-            // InternalMenuDsl.g:2177:3: ( ( rule__XImportSection__ImportDeclarationsAssignment ) )
-            // InternalMenuDsl.g:2178:4: ( rule__XImportSection__ImportDeclarationsAssignment )
+            // InternalMenuDsl.g:2227:3: ( ( rule__XImportSection__ImportDeclarationsAssignment ) )
+            // InternalMenuDsl.g:2228:4: ( rule__XImportSection__ImportDeclarationsAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsAssignment()); 
             }
-            // InternalMenuDsl.g:2179:4: ( rule__XImportSection__ImportDeclarationsAssignment )
-            // InternalMenuDsl.g:2179:5: rule__XImportSection__ImportDeclarationsAssignment
+            // InternalMenuDsl.g:2229:4: ( rule__XImportSection__ImportDeclarationsAssignment )
+            // InternalMenuDsl.g:2229:5: rule__XImportSection__ImportDeclarationsAssignment
             {
             pushFollow(FOLLOW_3);
             rule__XImportSection__ImportDeclarationsAssignment();
@@ -7316,13 +7488,13 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // InternalMenuDsl.g:2182:3: ( ( rule__XImportSection__ImportDeclarationsAssignment )* )
-            // InternalMenuDsl.g:2183:4: ( rule__XImportSection__ImportDeclarationsAssignment )*
+            // InternalMenuDsl.g:2232:3: ( ( rule__XImportSection__ImportDeclarationsAssignment )* )
+            // InternalMenuDsl.g:2233:4: ( rule__XImportSection__ImportDeclarationsAssignment )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsAssignment()); 
             }
-            // InternalMenuDsl.g:2184:4: ( rule__XImportSection__ImportDeclarationsAssignment )*
+            // InternalMenuDsl.g:2234:4: ( rule__XImportSection__ImportDeclarationsAssignment )*
             loop1:
             do {
                 int alt1=2;
@@ -7335,7 +7507,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
                 switch (alt1) {
             	case 1 :
-            	    // InternalMenuDsl.g:2184:5: rule__XImportSection__ImportDeclarationsAssignment
+            	    // InternalMenuDsl.g:2234:5: rule__XImportSection__ImportDeclarationsAssignment
             	    {
             	    pushFollow(FOLLOW_3);
             	    rule__XImportSection__ImportDeclarationsAssignment();
@@ -7379,11 +7551,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameInStaticImport"
-    // InternalMenuDsl.g:2194:1: entryRuleQualifiedNameInStaticImport : ruleQualifiedNameInStaticImport EOF ;
+    // InternalMenuDsl.g:2244:1: entryRuleQualifiedNameInStaticImport : ruleQualifiedNameInStaticImport EOF ;
     public final void entryRuleQualifiedNameInStaticImport() throws RecognitionException {
         try {
-            // InternalMenuDsl.g:2195:1: ( ruleQualifiedNameInStaticImport EOF )
-            // InternalMenuDsl.g:2196:1: ruleQualifiedNameInStaticImport EOF
+            // InternalMenuDsl.g:2245:1: ( ruleQualifiedNameInStaticImport EOF )
+            // InternalMenuDsl.g:2246:1: ruleQualifiedNameInStaticImport EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportRule()); 
@@ -7413,26 +7585,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleQualifiedNameInStaticImport"
-    // InternalMenuDsl.g:2203:1: ruleQualifiedNameInStaticImport : ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) ;
+    // InternalMenuDsl.g:2253:1: ruleQualifiedNameInStaticImport : ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) ;
     public final void ruleQualifiedNameInStaticImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2207:2: ( ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) )
-            // InternalMenuDsl.g:2208:2: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
+            // InternalMenuDsl.g:2257:2: ( ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) )
+            // InternalMenuDsl.g:2258:2: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
             {
-            // InternalMenuDsl.g:2208:2: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
-            // InternalMenuDsl.g:2209:3: ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
+            // InternalMenuDsl.g:2258:2: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
+            // InternalMenuDsl.g:2259:3: ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
             {
-            // InternalMenuDsl.g:2209:3: ( ( rule__QualifiedNameInStaticImport__Group__0 ) )
-            // InternalMenuDsl.g:2210:4: ( rule__QualifiedNameInStaticImport__Group__0 )
+            // InternalMenuDsl.g:2259:3: ( ( rule__QualifiedNameInStaticImport__Group__0 ) )
+            // InternalMenuDsl.g:2260:4: ( rule__QualifiedNameInStaticImport__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2211:4: ( rule__QualifiedNameInStaticImport__Group__0 )
-            // InternalMenuDsl.g:2211:5: rule__QualifiedNameInStaticImport__Group__0
+            // InternalMenuDsl.g:2261:4: ( rule__QualifiedNameInStaticImport__Group__0 )
+            // InternalMenuDsl.g:2261:5: rule__QualifiedNameInStaticImport__Group__0
             {
             pushFollow(FOLLOW_4);
             rule__QualifiedNameInStaticImport__Group__0();
@@ -7448,13 +7620,13 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // InternalMenuDsl.g:2214:3: ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
-            // InternalMenuDsl.g:2215:4: ( rule__QualifiedNameInStaticImport__Group__0 )*
+            // InternalMenuDsl.g:2264:3: ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
+            // InternalMenuDsl.g:2265:4: ( rule__QualifiedNameInStaticImport__Group__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup()); 
             }
-            // InternalMenuDsl.g:2216:4: ( rule__QualifiedNameInStaticImport__Group__0 )*
+            // InternalMenuDsl.g:2266:4: ( rule__QualifiedNameInStaticImport__Group__0 )*
             loop2:
             do {
                 int alt2=2;
@@ -7473,7 +7645,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
                 switch (alt2) {
             	case 1 :
-            	    // InternalMenuDsl.g:2216:5: rule__QualifiedNameInStaticImport__Group__0
+            	    // InternalMenuDsl.g:2266:5: rule__QualifiedNameInStaticImport__Group__0
             	    {
             	    pushFollow(FOLLOW_4);
             	    rule__QualifiedNameInStaticImport__Group__0();
@@ -7516,46 +7688,51 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleQualifiedNameInStaticImport"
 
 
-    // $ANTLR start "rule__MenuEntry__Alternatives_6"
-    // InternalMenuDsl.g:2225:1: rule__MenuEntry__Alternatives_6 : ( ( ( rule__MenuEntry__Group_6_0__0 ) ) | ( ( rule__MenuEntry__Group_6_1__0 ) ) | ( ( rule__MenuEntry__Group_6_2__0 ) ) | ( ( rule__MenuEntry__Group_6_3__0 ) ) | ( ( rule__MenuEntry__HasUserFilterAssignment_6_4 ) ) | ( ( rule__MenuEntry__HasKeyBindingAssignment_6_5 ) ) );
-    public final void rule__MenuEntry__Alternatives_6() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Alternatives_2"
+    // InternalMenuDsl.g:2275:1: rule__MenuCategory__Alternatives_2 : ( ( ( rule__MenuCategory__Group_2_0__0 ) ) | ( ( rule__MenuCategory__Group_2_1__0 ) ) | ( ( rule__MenuCategory__HasUserFilterAssignment_2_2 ) ) | ( ( rule__MenuCategory__HasReportPrinterAssignment_2_3 ) ) | ( ( rule__MenuCategory__HasKeyBindingAssignment_2_4 ) ) | ( ( rule__MenuCategory__HasSystemSettingsAssignment_2_5 ) ) | ( ( rule__MenuCategory__Group_2_6__0 ) ) );
+    public final void rule__MenuCategory__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2229:1: ( ( ( rule__MenuEntry__Group_6_0__0 ) ) | ( ( rule__MenuEntry__Group_6_1__0 ) ) | ( ( rule__MenuEntry__Group_6_2__0 ) ) | ( ( rule__MenuEntry__Group_6_3__0 ) ) | ( ( rule__MenuEntry__HasUserFilterAssignment_6_4 ) ) | ( ( rule__MenuEntry__HasKeyBindingAssignment_6_5 ) ) )
-            int alt3=6;
+            // InternalMenuDsl.g:2279:1: ( ( ( rule__MenuCategory__Group_2_0__0 ) ) | ( ( rule__MenuCategory__Group_2_1__0 ) ) | ( ( rule__MenuCategory__HasUserFilterAssignment_2_2 ) ) | ( ( rule__MenuCategory__HasReportPrinterAssignment_2_3 ) ) | ( ( rule__MenuCategory__HasKeyBindingAssignment_2_4 ) ) | ( ( rule__MenuCategory__HasSystemSettingsAssignment_2_5 ) ) | ( ( rule__MenuCategory__Group_2_6__0 ) ) )
+            int alt3=7;
             switch ( input.LA(1) ) {
-            case 94:
+            case 92:
                 {
                 alt3=1;
                 }
                 break;
-            case 95:
+            case 93:
                 {
                 alt3=2;
                 }
                 break;
-            case 96:
+            case 94:
                 {
                 alt3=3;
                 }
                 break;
-            case 97:
+            case 95:
                 {
                 alt3=4;
                 }
                 break;
-            case 98:
+            case 96:
                 {
                 alt3=5;
                 }
                 break;
-            case 99:
+            case 97:
                 {
                 alt3=6;
                 }
                 break;
+            case 57:
+                {
+                alt3=7;
+                }
+                break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
@@ -7566,19 +7743,19 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
             switch (alt3) {
                 case 1 :
-                    // InternalMenuDsl.g:2230:2: ( ( rule__MenuEntry__Group_6_0__0 ) )
+                    // InternalMenuDsl.g:2280:2: ( ( rule__MenuCategory__Group_2_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2230:2: ( ( rule__MenuEntry__Group_6_0__0 ) )
-                    // InternalMenuDsl.g:2231:3: ( rule__MenuEntry__Group_6_0__0 )
+                    // InternalMenuDsl.g:2280:2: ( ( rule__MenuCategory__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:2281:3: ( rule__MenuCategory__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMenuEntryAccess().getGroup_6_0()); 
+                       before(grammarAccess.getMenuCategoryAccess().getGroup_2_0()); 
                     }
-                    // InternalMenuDsl.g:2232:3: ( rule__MenuEntry__Group_6_0__0 )
-                    // InternalMenuDsl.g:2232:4: rule__MenuEntry__Group_6_0__0
+                    // InternalMenuDsl.g:2282:3: ( rule__MenuCategory__Group_2_0__0 )
+                    // InternalMenuDsl.g:2282:4: rule__MenuCategory__Group_2_0__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Group_6_0__0();
+                    rule__MenuCategory__Group_2_0__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -7586,7 +7763,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMenuEntryAccess().getGroup_6_0()); 
+                       after(grammarAccess.getMenuCategoryAccess().getGroup_2_0()); 
                     }
 
                     }
@@ -7595,19 +7772,19 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2236:2: ( ( rule__MenuEntry__Group_6_1__0 ) )
+                    // InternalMenuDsl.g:2286:2: ( ( rule__MenuCategory__Group_2_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2236:2: ( ( rule__MenuEntry__Group_6_1__0 ) )
-                    // InternalMenuDsl.g:2237:3: ( rule__MenuEntry__Group_6_1__0 )
+                    // InternalMenuDsl.g:2286:2: ( ( rule__MenuCategory__Group_2_1__0 ) )
+                    // InternalMenuDsl.g:2287:3: ( rule__MenuCategory__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMenuEntryAccess().getGroup_6_1()); 
+                       before(grammarAccess.getMenuCategoryAccess().getGroup_2_1()); 
                     }
-                    // InternalMenuDsl.g:2238:3: ( rule__MenuEntry__Group_6_1__0 )
-                    // InternalMenuDsl.g:2238:4: rule__MenuEntry__Group_6_1__0
+                    // InternalMenuDsl.g:2288:3: ( rule__MenuCategory__Group_2_1__0 )
+                    // InternalMenuDsl.g:2288:4: rule__MenuCategory__Group_2_1__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Group_6_1__0();
+                    rule__MenuCategory__Group_2_1__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -7615,7 +7792,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMenuEntryAccess().getGroup_6_1()); 
+                       after(grammarAccess.getMenuCategoryAccess().getGroup_2_1()); 
                     }
 
                     }
@@ -7624,19 +7801,19 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2242:2: ( ( rule__MenuEntry__Group_6_2__0 ) )
+                    // InternalMenuDsl.g:2292:2: ( ( rule__MenuCategory__HasUserFilterAssignment_2_2 ) )
                     {
-                    // InternalMenuDsl.g:2242:2: ( ( rule__MenuEntry__Group_6_2__0 ) )
-                    // InternalMenuDsl.g:2243:3: ( rule__MenuEntry__Group_6_2__0 )
+                    // InternalMenuDsl.g:2292:2: ( ( rule__MenuCategory__HasUserFilterAssignment_2_2 ) )
+                    // InternalMenuDsl.g:2293:3: ( rule__MenuCategory__HasUserFilterAssignment_2_2 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMenuEntryAccess().getGroup_6_2()); 
+                       before(grammarAccess.getMenuCategoryAccess().getHasUserFilterAssignment_2_2()); 
                     }
-                    // InternalMenuDsl.g:2244:3: ( rule__MenuEntry__Group_6_2__0 )
-                    // InternalMenuDsl.g:2244:4: rule__MenuEntry__Group_6_2__0
+                    // InternalMenuDsl.g:2294:3: ( rule__MenuCategory__HasUserFilterAssignment_2_2 )
+                    // InternalMenuDsl.g:2294:4: rule__MenuCategory__HasUserFilterAssignment_2_2
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Group_6_2__0();
+                    rule__MenuCategory__HasUserFilterAssignment_2_2();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -7644,7 +7821,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMenuEntryAccess().getGroup_6_2()); 
+                       after(grammarAccess.getMenuCategoryAccess().getHasUserFilterAssignment_2_2()); 
                     }
 
                     }
@@ -7653,19 +7830,19 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2248:2: ( ( rule__MenuEntry__Group_6_3__0 ) )
+                    // InternalMenuDsl.g:2298:2: ( ( rule__MenuCategory__HasReportPrinterAssignment_2_3 ) )
                     {
-                    // InternalMenuDsl.g:2248:2: ( ( rule__MenuEntry__Group_6_3__0 ) )
-                    // InternalMenuDsl.g:2249:3: ( rule__MenuEntry__Group_6_3__0 )
+                    // InternalMenuDsl.g:2298:2: ( ( rule__MenuCategory__HasReportPrinterAssignment_2_3 ) )
+                    // InternalMenuDsl.g:2299:3: ( rule__MenuCategory__HasReportPrinterAssignment_2_3 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMenuEntryAccess().getGroup_6_3()); 
+                       before(grammarAccess.getMenuCategoryAccess().getHasReportPrinterAssignment_2_3()); 
                     }
-                    // InternalMenuDsl.g:2250:3: ( rule__MenuEntry__Group_6_3__0 )
-                    // InternalMenuDsl.g:2250:4: rule__MenuEntry__Group_6_3__0
+                    // InternalMenuDsl.g:2300:3: ( rule__MenuCategory__HasReportPrinterAssignment_2_3 )
+                    // InternalMenuDsl.g:2300:4: rule__MenuCategory__HasReportPrinterAssignment_2_3
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Group_6_3__0();
+                    rule__MenuCategory__HasReportPrinterAssignment_2_3();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -7673,7 +7850,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMenuEntryAccess().getGroup_6_3()); 
+                       after(grammarAccess.getMenuCategoryAccess().getHasReportPrinterAssignment_2_3()); 
                     }
 
                     }
@@ -7682,19 +7859,19 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:2254:2: ( ( rule__MenuEntry__HasUserFilterAssignment_6_4 ) )
+                    // InternalMenuDsl.g:2304:2: ( ( rule__MenuCategory__HasKeyBindingAssignment_2_4 ) )
                     {
-                    // InternalMenuDsl.g:2254:2: ( ( rule__MenuEntry__HasUserFilterAssignment_6_4 ) )
-                    // InternalMenuDsl.g:2255:3: ( rule__MenuEntry__HasUserFilterAssignment_6_4 )
+                    // InternalMenuDsl.g:2304:2: ( ( rule__MenuCategory__HasKeyBindingAssignment_2_4 ) )
+                    // InternalMenuDsl.g:2305:3: ( rule__MenuCategory__HasKeyBindingAssignment_2_4 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMenuEntryAccess().getHasUserFilterAssignment_6_4()); 
+                       before(grammarAccess.getMenuCategoryAccess().getHasKeyBindingAssignment_2_4()); 
                     }
-                    // InternalMenuDsl.g:2256:3: ( rule__MenuEntry__HasUserFilterAssignment_6_4 )
-                    // InternalMenuDsl.g:2256:4: rule__MenuEntry__HasUserFilterAssignment_6_4
+                    // InternalMenuDsl.g:2306:3: ( rule__MenuCategory__HasKeyBindingAssignment_2_4 )
+                    // InternalMenuDsl.g:2306:4: rule__MenuCategory__HasKeyBindingAssignment_2_4
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuEntry__HasUserFilterAssignment_6_4();
+                    rule__MenuCategory__HasKeyBindingAssignment_2_4();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -7702,7 +7879,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMenuEntryAccess().getHasUserFilterAssignment_6_4()); 
+                       after(grammarAccess.getMenuCategoryAccess().getHasKeyBindingAssignment_2_4()); 
                     }
 
                     }
@@ -7711,19 +7888,148 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:2260:2: ( ( rule__MenuEntry__HasKeyBindingAssignment_6_5 ) )
+                    // InternalMenuDsl.g:2310:2: ( ( rule__MenuCategory__HasSystemSettingsAssignment_2_5 ) )
+                    {
+                    // InternalMenuDsl.g:2310:2: ( ( rule__MenuCategory__HasSystemSettingsAssignment_2_5 ) )
+                    // InternalMenuDsl.g:2311:3: ( rule__MenuCategory__HasSystemSettingsAssignment_2_5 )
+                    {
+                    if ( state.backtracking==0 ) {
+                       before(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsAssignment_2_5()); 
+                    }
+                    // InternalMenuDsl.g:2312:3: ( rule__MenuCategory__HasSystemSettingsAssignment_2_5 )
+                    // InternalMenuDsl.g:2312:4: rule__MenuCategory__HasSystemSettingsAssignment_2_5
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__MenuCategory__HasSystemSettingsAssignment_2_5();
+
+                    state._fsp--;
+                    if (state.failed) return ;
+
+                    }
+
+                    if ( state.backtracking==0 ) {
+                       after(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsAssignment_2_5()); 
+                    }
+
+                    }
+
+
+                    }
+                    break;
+                case 7 :
+                    // InternalMenuDsl.g:2316:2: ( ( rule__MenuCategory__Group_2_6__0 ) )
+                    {
+                    // InternalMenuDsl.g:2316:2: ( ( rule__MenuCategory__Group_2_6__0 ) )
+                    // InternalMenuDsl.g:2317:3: ( rule__MenuCategory__Group_2_6__0 )
+                    {
+                    if ( state.backtracking==0 ) {
+                       before(grammarAccess.getMenuCategoryAccess().getGroup_2_6()); 
+                    }
+                    // InternalMenuDsl.g:2318:3: ( rule__MenuCategory__Group_2_6__0 )
+                    // InternalMenuDsl.g:2318:4: rule__MenuCategory__Group_2_6__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__MenuCategory__Group_2_6__0();
+
+                    state._fsp--;
+                    if (state.failed) return ;
+
+                    }
+
+                    if ( state.backtracking==0 ) {
+                       after(grammarAccess.getMenuCategoryAccess().getGroup_2_6()); 
+                    }
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuCategory__Alternatives_2"
+
+
+    // $ANTLR start "rule__MenuEntry__Alternatives_3"
+    // InternalMenuDsl.g:2326:1: rule__MenuEntry__Alternatives_3 : ( ( ( rule__MenuEntry__Group_3_0__0 ) ) | ( ( rule__MenuEntry__Group_3_1__0 ) ) );
+    public final void rule__MenuEntry__Alternatives_3() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:2330:1: ( ( ( rule__MenuEntry__Group_3_0__0 ) ) | ( ( rule__MenuEntry__Group_3_1__0 ) ) )
+            int alt4=2;
+            int LA4_0 = input.LA(1);
+
+            if ( (LA4_0==100) ) {
+                alt4=1;
+            }
+            else if ( (LA4_0==101) ) {
+                alt4=2;
+            }
+            else {
+                if (state.backtracking>0) {state.failed=true; return ;}
+                NoViableAltException nvae =
+                    new NoViableAltException("", 4, 0, input);
+
+                throw nvae;
+            }
+            switch (alt4) {
+                case 1 :
+                    // InternalMenuDsl.g:2331:2: ( ( rule__MenuEntry__Group_3_0__0 ) )
+                    {
+                    // InternalMenuDsl.g:2331:2: ( ( rule__MenuEntry__Group_3_0__0 ) )
+                    // InternalMenuDsl.g:2332:3: ( rule__MenuEntry__Group_3_0__0 )
+                    {
+                    if ( state.backtracking==0 ) {
+                       before(grammarAccess.getMenuEntryAccess().getGroup_3_0()); 
+                    }
+                    // InternalMenuDsl.g:2333:3: ( rule__MenuEntry__Group_3_0__0 )
+                    // InternalMenuDsl.g:2333:4: rule__MenuEntry__Group_3_0__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__MenuEntry__Group_3_0__0();
+
+                    state._fsp--;
+                    if (state.failed) return ;
+
+                    }
+
+                    if ( state.backtracking==0 ) {
+                       after(grammarAccess.getMenuEntryAccess().getGroup_3_0()); 
+                    }
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalMenuDsl.g:2337:2: ( ( rule__MenuEntry__Group_3_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2260:2: ( ( rule__MenuEntry__HasKeyBindingAssignment_6_5 ) )
-                    // InternalMenuDsl.g:2261:3: ( rule__MenuEntry__HasKeyBindingAssignment_6_5 )
+                    // InternalMenuDsl.g:2337:2: ( ( rule__MenuEntry__Group_3_1__0 ) )
+                    // InternalMenuDsl.g:2338:3: ( rule__MenuEntry__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMenuEntryAccess().getHasKeyBindingAssignment_6_5()); 
+                       before(grammarAccess.getMenuEntryAccess().getGroup_3_1()); 
                     }
-                    // InternalMenuDsl.g:2262:3: ( rule__MenuEntry__HasKeyBindingAssignment_6_5 )
-                    // InternalMenuDsl.g:2262:4: rule__MenuEntry__HasKeyBindingAssignment_6_5
+                    // InternalMenuDsl.g:2339:3: ( rule__MenuEntry__Group_3_1__0 )
+                    // InternalMenuDsl.g:2339:4: rule__MenuEntry__Group_3_1__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuEntry__HasKeyBindingAssignment_6_5();
+                    rule__MenuEntry__Group_3_1__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -7731,7 +8037,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMenuEntryAccess().getHasKeyBindingAssignment_6_5()); 
+                       after(grammarAccess.getMenuEntryAccess().getGroup_3_1()); 
                     }
 
                     }
@@ -7753,31 +8059,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Alternatives_6"
+    // $ANTLR end "rule__MenuEntry__Alternatives_3"
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_2"
-    // InternalMenuDsl.g:2270:1: rule__XImportDeclaration__Alternatives_2 : ( ( ( rule__XImportDeclaration__Group_2_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) ) | ( ( rule__XImportDeclaration__Group_2_3__0 ) ) );
+    // InternalMenuDsl.g:2347:1: rule__XImportDeclaration__Alternatives_2 : ( ( ( rule__XImportDeclaration__Group_2_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) ) | ( ( rule__XImportDeclaration__Group_2_3__0 ) ) );
     public final void rule__XImportDeclaration__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2274:1: ( ( ( rule__XImportDeclaration__Group_2_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) ) | ( ( rule__XImportDeclaration__Group_2_3__0 ) ) )
-            int alt4=4;
-            alt4 = dfa4.predict(input);
-            switch (alt4) {
+            // InternalMenuDsl.g:2351:1: ( ( ( rule__XImportDeclaration__Group_2_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) ) | ( ( rule__XImportDeclaration__Group_2_3__0 ) ) )
+            int alt5=4;
+            alt5 = dfa5.predict(input);
+            switch (alt5) {
                 case 1 :
-                    // InternalMenuDsl.g:2275:2: ( ( rule__XImportDeclaration__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:2352:2: ( ( rule__XImportDeclaration__Group_2_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2275:2: ( ( rule__XImportDeclaration__Group_2_0__0 ) )
-                    // InternalMenuDsl.g:2276:3: ( rule__XImportDeclaration__Group_2_0__0 )
+                    // InternalMenuDsl.g:2352:2: ( ( rule__XImportDeclaration__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:2353:3: ( rule__XImportDeclaration__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getGroup_2_0()); 
                     }
-                    // InternalMenuDsl.g:2277:3: ( rule__XImportDeclaration__Group_2_0__0 )
-                    // InternalMenuDsl.g:2277:4: rule__XImportDeclaration__Group_2_0__0
+                    // InternalMenuDsl.g:2354:3: ( rule__XImportDeclaration__Group_2_0__0 )
+                    // InternalMenuDsl.g:2354:4: rule__XImportDeclaration__Group_2_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__Group_2_0__0();
@@ -7797,16 +8103,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2281:2: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) )
+                    // InternalMenuDsl.g:2358:2: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) )
                     {
-                    // InternalMenuDsl.g:2281:2: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) )
-                    // InternalMenuDsl.g:2282:3: ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 )
+                    // InternalMenuDsl.g:2358:2: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) )
+                    // InternalMenuDsl.g:2359:3: ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_2_1()); 
                     }
-                    // InternalMenuDsl.g:2283:3: ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 )
-                    // InternalMenuDsl.g:2283:4: rule__XImportDeclaration__ImportedTypeAssignment_2_1
+                    // InternalMenuDsl.g:2360:3: ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 )
+                    // InternalMenuDsl.g:2360:4: rule__XImportDeclaration__ImportedTypeAssignment_2_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedTypeAssignment_2_1();
@@ -7826,16 +8132,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2287:2: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) )
+                    // InternalMenuDsl.g:2364:2: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) )
                     {
-                    // InternalMenuDsl.g:2287:2: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) )
-                    // InternalMenuDsl.g:2288:3: ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 )
+                    // InternalMenuDsl.g:2364:2: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) )
+                    // InternalMenuDsl.g:2365:3: ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceAssignment_2_2()); 
                     }
-                    // InternalMenuDsl.g:2289:3: ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 )
-                    // InternalMenuDsl.g:2289:4: rule__XImportDeclaration__ImportedNamespaceAssignment_2_2
+                    // InternalMenuDsl.g:2366:3: ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 )
+                    // InternalMenuDsl.g:2366:4: rule__XImportDeclaration__ImportedNamespaceAssignment_2_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedNamespaceAssignment_2_2();
@@ -7855,16 +8161,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2293:2: ( ( rule__XImportDeclaration__Group_2_3__0 ) )
+                    // InternalMenuDsl.g:2370:2: ( ( rule__XImportDeclaration__Group_2_3__0 ) )
                     {
-                    // InternalMenuDsl.g:2293:2: ( ( rule__XImportDeclaration__Group_2_3__0 ) )
-                    // InternalMenuDsl.g:2294:3: ( rule__XImportDeclaration__Group_2_3__0 )
+                    // InternalMenuDsl.g:2370:2: ( ( rule__XImportDeclaration__Group_2_3__0 ) )
+                    // InternalMenuDsl.g:2371:3: ( rule__XImportDeclaration__Group_2_3__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getGroup_2_3()); 
                     }
-                    // InternalMenuDsl.g:2295:3: ( rule__XImportDeclaration__Group_2_3__0 )
-                    // InternalMenuDsl.g:2295:4: rule__XImportDeclaration__Group_2_3__0
+                    // InternalMenuDsl.g:2372:3: ( rule__XImportDeclaration__Group_2_3__0 )
+                    // InternalMenuDsl.g:2372:4: rule__XImportDeclaration__Group_2_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__Group_2_3__0();
@@ -7901,41 +8207,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_2_0_3"
-    // InternalMenuDsl.g:2303:1: rule__XImportDeclaration__Alternatives_2_0_3 : ( ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) ) );
+    // InternalMenuDsl.g:2380:1: rule__XImportDeclaration__Alternatives_2_0_3 : ( ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) ) );
     public final void rule__XImportDeclaration__Alternatives_2_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2307:1: ( ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) ) )
-            int alt5=2;
-            int LA5_0 = input.LA(1);
+            // InternalMenuDsl.g:2384:1: ( ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) ) )
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA5_0==36) ) {
-                alt5=1;
+            if ( (LA6_0==36) ) {
+                alt6=1;
             }
-            else if ( (LA5_0==RULE_ID) ) {
-                alt5=2;
+            else if ( (LA6_0==RULE_ID) ) {
+                alt6=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 5, 0, input);
+                    new NoViableAltException("", 6, 0, input);
 
                 throw nvae;
             }
-            switch (alt5) {
+            switch (alt6) {
                 case 1 :
-                    // InternalMenuDsl.g:2308:2: ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) )
+                    // InternalMenuDsl.g:2385:2: ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) )
                     {
-                    // InternalMenuDsl.g:2308:2: ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) )
-                    // InternalMenuDsl.g:2309:3: ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 )
+                    // InternalMenuDsl.g:2385:2: ( ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 ) )
+                    // InternalMenuDsl.g:2386:3: ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getWildcardAssignment_2_0_3_0()); 
                     }
-                    // InternalMenuDsl.g:2310:3: ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 )
-                    // InternalMenuDsl.g:2310:4: rule__XImportDeclaration__WildcardAssignment_2_0_3_0
+                    // InternalMenuDsl.g:2387:3: ( rule__XImportDeclaration__WildcardAssignment_2_0_3_0 )
+                    // InternalMenuDsl.g:2387:4: rule__XImportDeclaration__WildcardAssignment_2_0_3_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__WildcardAssignment_2_0_3_0();
@@ -7955,16 +8261,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2314:2: ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) )
+                    // InternalMenuDsl.g:2391:2: ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) )
                     {
-                    // InternalMenuDsl.g:2314:2: ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) )
-                    // InternalMenuDsl.g:2315:3: ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 )
+                    // InternalMenuDsl.g:2391:2: ( ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 ) )
+                    // InternalMenuDsl.g:2392:3: ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getMemberNameAssignment_2_0_3_1()); 
                     }
-                    // InternalMenuDsl.g:2316:3: ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 )
-                    // InternalMenuDsl.g:2316:4: rule__XImportDeclaration__MemberNameAssignment_2_0_3_1
+                    // InternalMenuDsl.g:2393:3: ( rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 )
+                    // InternalMenuDsl.g:2393:4: rule__XImportDeclaration__MemberNameAssignment_2_0_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__MemberNameAssignment_2_0_3_1();
@@ -8001,27 +8307,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Alternatives_3_1"
-    // InternalMenuDsl.g:2324:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );
+    // InternalMenuDsl.g:2401:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );
     public final void rule__XAnnotation__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2328:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) )
-            int alt6=2;
-            alt6 = dfa6.predict(input);
-            switch (alt6) {
+            // InternalMenuDsl.g:2405:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) )
+            int alt7=2;
+            alt7 = dfa7.predict(input);
+            switch (alt7) {
                 case 1 :
-                    // InternalMenuDsl.g:2329:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+                    // InternalMenuDsl.g:2406:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2329:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
-                    // InternalMenuDsl.g:2330:3: ( rule__XAnnotation__Group_3_1_0__0 )
+                    // InternalMenuDsl.g:2406:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+                    // InternalMenuDsl.g:2407:3: ( rule__XAnnotation__Group_3_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0()); 
                     }
-                    // InternalMenuDsl.g:2331:3: ( rule__XAnnotation__Group_3_1_0__0 )
-                    // InternalMenuDsl.g:2331:4: rule__XAnnotation__Group_3_1_0__0
+                    // InternalMenuDsl.g:2408:3: ( rule__XAnnotation__Group_3_1_0__0 )
+                    // InternalMenuDsl.g:2408:4: rule__XAnnotation__Group_3_1_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotation__Group_3_1_0__0();
@@ -8041,16 +8347,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2335:2: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
+                    // InternalMenuDsl.g:2412:2: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
                     {
-                    // InternalMenuDsl.g:2335:2: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
-                    // InternalMenuDsl.g:2336:3: ( rule__XAnnotation__ValueAssignment_3_1_1 )
+                    // InternalMenuDsl.g:2412:2: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
+                    // InternalMenuDsl.g:2413:3: ( rule__XAnnotation__ValueAssignment_3_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationAccess().getValueAssignment_3_1_1()); 
                     }
-                    // InternalMenuDsl.g:2337:3: ( rule__XAnnotation__ValueAssignment_3_1_1 )
-                    // InternalMenuDsl.g:2337:4: rule__XAnnotation__ValueAssignment_3_1_1
+                    // InternalMenuDsl.g:2414:3: ( rule__XAnnotation__ValueAssignment_3_1_1 )
+                    // InternalMenuDsl.g:2414:4: rule__XAnnotation__ValueAssignment_3_1_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotation__ValueAssignment_3_1_1();
@@ -8087,27 +8393,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Alternatives"
-    // InternalMenuDsl.g:2345:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );
+    // InternalMenuDsl.g:2422:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );
     public final void rule__XAnnotationElementValueOrCommaList__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2349:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) )
-            int alt7=2;
-            alt7 = dfa7.predict(input);
-            switch (alt7) {
+            // InternalMenuDsl.g:2426:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) )
+            int alt8=2;
+            alt8 = dfa8.predict(input);
+            switch (alt8) {
                 case 1 :
-                    // InternalMenuDsl.g:2350:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+                    // InternalMenuDsl.g:2427:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2350:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
-                    // InternalMenuDsl.g:2351:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+                    // InternalMenuDsl.g:2427:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+                    // InternalMenuDsl.g:2428:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0()); 
                     }
-                    // InternalMenuDsl.g:2352:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
-                    // InternalMenuDsl.g:2352:4: rule__XAnnotationElementValueOrCommaList__Group_0__0
+                    // InternalMenuDsl.g:2429:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+                    // InternalMenuDsl.g:2429:4: rule__XAnnotationElementValueOrCommaList__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_0__0();
@@ -8127,16 +8433,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2356:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
+                    // InternalMenuDsl.g:2433:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2356:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
-                    // InternalMenuDsl.g:2357:3: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
+                    // InternalMenuDsl.g:2433:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
+                    // InternalMenuDsl.g:2434:3: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1()); 
                     }
-                    // InternalMenuDsl.g:2358:3: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
-                    // InternalMenuDsl.g:2358:4: rule__XAnnotationElementValueOrCommaList__Group_1__0
+                    // InternalMenuDsl.g:2435:3: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
+                    // InternalMenuDsl.g:2435:4: rule__XAnnotationElementValueOrCommaList__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_1__0();
@@ -8173,27 +8479,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Alternatives"
-    // InternalMenuDsl.g:2366:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );
+    // InternalMenuDsl.g:2443:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );
     public final void rule__XAnnotationElementValue__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2370:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) )
-            int alt8=2;
-            alt8 = dfa8.predict(input);
-            switch (alt8) {
+            // InternalMenuDsl.g:2447:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) )
+            int alt9=2;
+            alt9 = dfa9.predict(input);
+            switch (alt9) {
                 case 1 :
-                    // InternalMenuDsl.g:2371:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+                    // InternalMenuDsl.g:2448:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2371:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
-                    // InternalMenuDsl.g:2372:3: ( rule__XAnnotationElementValue__Group_0__0 )
+                    // InternalMenuDsl.g:2448:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+                    // InternalMenuDsl.g:2449:3: ( rule__XAnnotationElementValue__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0()); 
                     }
-                    // InternalMenuDsl.g:2373:3: ( rule__XAnnotationElementValue__Group_0__0 )
-                    // InternalMenuDsl.g:2373:4: rule__XAnnotationElementValue__Group_0__0
+                    // InternalMenuDsl.g:2450:3: ( rule__XAnnotationElementValue__Group_0__0 )
+                    // InternalMenuDsl.g:2450:4: rule__XAnnotationElementValue__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValue__Group_0__0();
@@ -8213,10 +8519,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2377:2: ( ruleXAnnotationOrExpression )
+                    // InternalMenuDsl.g:2454:2: ( ruleXAnnotationOrExpression )
                     {
-                    // InternalMenuDsl.g:2377:2: ( ruleXAnnotationOrExpression )
-                    // InternalMenuDsl.g:2378:3: ruleXAnnotationOrExpression
+                    // InternalMenuDsl.g:2454:2: ( ruleXAnnotationOrExpression )
+                    // InternalMenuDsl.g:2455:3: ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueAccess().getXAnnotationOrExpressionParserRuleCall_1()); 
@@ -8253,35 +8559,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationOrExpression__Alternatives"
-    // InternalMenuDsl.g:2387:1: rule__XAnnotationOrExpression__Alternatives : ( ( ruleXAnnotation ) | ( ruleXExpression ) );
+    // InternalMenuDsl.g:2464:1: rule__XAnnotationOrExpression__Alternatives : ( ( ruleXAnnotation ) | ( ruleXExpression ) );
     public final void rule__XAnnotationOrExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2391:1: ( ( ruleXAnnotation ) | ( ruleXExpression ) )
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // InternalMenuDsl.g:2468:1: ( ( ruleXAnnotation ) | ( ruleXExpression ) )
+            int alt10=2;
+            int LA10_0 = input.LA(1);
 
-            if ( (LA9_0==60) ) {
-                alt9=1;
+            if ( (LA10_0==62) ) {
+                alt10=1;
             }
-            else if ( ((LA9_0>=RULE_STRING && LA9_0<=RULE_DECIMAL)||LA9_0==27||(LA9_0>=34 && LA9_0<=35)||LA9_0==40||(LA9_0>=45 && LA9_0<=50)||LA9_0==52||LA9_0==61||(LA9_0>=65 && LA9_0<=66)||LA9_0==69||LA9_0==71||(LA9_0>=75 && LA9_0<=83)||LA9_0==85||LA9_0==105) ) {
-                alt9=2;
+            else if ( ((LA10_0>=RULE_STRING && LA10_0<=RULE_DECIMAL)||LA10_0==27||(LA10_0>=34 && LA10_0<=35)||LA10_0==40||(LA10_0>=45 && LA10_0<=50)||LA10_0==57||LA10_0==63||(LA10_0>=67 && LA10_0<=68)||LA10_0==71||LA10_0==73||(LA10_0>=77 && LA10_0<=85)||LA10_0==87||LA10_0==107) ) {
+                alt10=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 9, 0, input);
+                    new NoViableAltException("", 10, 0, input);
 
                 throw nvae;
             }
-            switch (alt9) {
+            switch (alt10) {
                 case 1 :
-                    // InternalMenuDsl.g:2392:2: ( ruleXAnnotation )
+                    // InternalMenuDsl.g:2469:2: ( ruleXAnnotation )
                     {
-                    // InternalMenuDsl.g:2392:2: ( ruleXAnnotation )
-                    // InternalMenuDsl.g:2393:3: ruleXAnnotation
+                    // InternalMenuDsl.g:2469:2: ( ruleXAnnotation )
+                    // InternalMenuDsl.g:2470:3: ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationOrExpressionAccess().getXAnnotationParserRuleCall_0()); 
@@ -8301,10 +8607,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2398:2: ( ruleXExpression )
+                    // InternalMenuDsl.g:2475:2: ( ruleXExpression )
                     {
-                    // InternalMenuDsl.g:2398:2: ( ruleXExpression )
-                    // InternalMenuDsl.g:2399:3: ruleXExpression
+                    // InternalMenuDsl.g:2475:2: ( ruleXExpression )
+                    // InternalMenuDsl.g:2476:3: ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationOrExpressionAccess().getXExpressionParserRuleCall_1()); 
@@ -8341,29 +8647,29 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Alternatives"
-    // InternalMenuDsl.g:2408:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
+    // InternalMenuDsl.g:2485:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
     public final void rule__XAssignment__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2412:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
-            int alt10=2;
+            // InternalMenuDsl.g:2489:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
+            int alt11=2;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                int LA10_1 = input.LA(2);
+                int LA11_1 = input.LA(2);
 
-                if ( (LA10_1==13) ) {
-                    alt10=1;
+                if ( (LA11_1==13) ) {
+                    alt11=1;
                 }
-                else if ( (LA10_1==EOF||(LA10_1>=RULE_STRING && LA10_1<=RULE_DECIMAL)||(LA10_1>=14 && LA10_1<=50)||LA10_1==52||LA10_1==55||LA10_1==59||(LA10_1>=61 && LA10_1<=86)||(LA10_1>=101 && LA10_1<=102)||(LA10_1>=104 && LA10_1<=105)) ) {
-                    alt10=2;
+                else if ( (LA11_1==EOF||(LA11_1>=RULE_STRING && LA11_1<=RULE_DECIMAL)||(LA11_1>=14 && LA11_1<=50)||(LA11_1>=57 && LA11_1<=58)||LA11_1==61||(LA11_1>=63 && LA11_1<=88)||(LA11_1>=103 && LA11_1<=104)||(LA11_1>=106 && LA11_1<=107)) ) {
+                    alt11=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 10, 1, input);
+                        new NoViableAltException("", 11, 1, input);
 
                     throw nvae;
                 }
@@ -8371,18 +8677,18 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 break;
             case 45:
                 {
-                int LA10_2 = input.LA(2);
+                int LA11_2 = input.LA(2);
 
-                if ( (LA10_2==EOF||(LA10_2>=RULE_STRING && LA10_2<=RULE_DECIMAL)||(LA10_2>=14 && LA10_2<=50)||LA10_2==52||LA10_2==55||LA10_2==59||(LA10_2>=61 && LA10_2<=86)||(LA10_2>=101 && LA10_2<=102)||(LA10_2>=104 && LA10_2<=105)) ) {
-                    alt10=2;
+                if ( (LA11_2==EOF||(LA11_2>=RULE_STRING && LA11_2<=RULE_DECIMAL)||(LA11_2>=14 && LA11_2<=50)||(LA11_2>=57 && LA11_2<=58)||LA11_2==61||(LA11_2>=63 && LA11_2<=88)||(LA11_2>=103 && LA11_2<=104)||(LA11_2>=106 && LA11_2<=107)) ) {
+                    alt11=2;
                 }
-                else if ( (LA10_2==13) ) {
-                    alt10=1;
+                else if ( (LA11_2==13) ) {
+                    alt11=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 10, 2, input);
+                        new NoViableAltException("", 11, 2, input);
 
                     throw nvae;
                 }
@@ -8390,18 +8696,18 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 break;
             case 46:
                 {
-                int LA10_3 = input.LA(2);
+                int LA11_3 = input.LA(2);
 
-                if ( (LA10_3==13) ) {
-                    alt10=1;
+                if ( (LA11_3==13) ) {
+                    alt11=1;
                 }
-                else if ( (LA10_3==EOF||(LA10_3>=RULE_STRING && LA10_3<=RULE_DECIMAL)||(LA10_3>=14 && LA10_3<=50)||LA10_3==52||LA10_3==55||LA10_3==59||(LA10_3>=61 && LA10_3<=86)||(LA10_3>=101 && LA10_3<=102)||(LA10_3>=104 && LA10_3<=105)) ) {
-                    alt10=2;
+                else if ( (LA11_3==EOF||(LA11_3>=RULE_STRING && LA11_3<=RULE_DECIMAL)||(LA11_3>=14 && LA11_3<=50)||(LA11_3>=57 && LA11_3<=58)||LA11_3==61||(LA11_3>=63 && LA11_3<=88)||(LA11_3>=103 && LA11_3<=104)||(LA11_3>=106 && LA11_3<=107)) ) {
+                    alt11=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 10, 3, input);
+                        new NoViableAltException("", 11, 3, input);
 
                     throw nvae;
                 }
@@ -8409,18 +8715,18 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 break;
             case 47:
                 {
-                int LA10_4 = input.LA(2);
+                int LA11_4 = input.LA(2);
 
-                if ( (LA10_4==EOF||(LA10_4>=RULE_STRING && LA10_4<=RULE_DECIMAL)||(LA10_4>=14 && LA10_4<=50)||LA10_4==52||LA10_4==55||LA10_4==59||(LA10_4>=61 && LA10_4<=86)||(LA10_4>=101 && LA10_4<=102)||(LA10_4>=104 && LA10_4<=105)) ) {
-                    alt10=2;
+                if ( (LA11_4==EOF||(LA11_4>=RULE_STRING && LA11_4<=RULE_DECIMAL)||(LA11_4>=14 && LA11_4<=50)||(LA11_4>=57 && LA11_4<=58)||LA11_4==61||(LA11_4>=63 && LA11_4<=88)||(LA11_4>=103 && LA11_4<=104)||(LA11_4>=106 && LA11_4<=107)) ) {
+                    alt11=2;
                 }
-                else if ( (LA10_4==13) ) {
-                    alt10=1;
+                else if ( (LA11_4==13) ) {
+                    alt11=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 10, 4, input);
+                        new NoViableAltException("", 11, 4, input);
 
                     throw nvae;
                 }
@@ -8428,18 +8734,18 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 break;
             case 48:
                 {
-                int LA10_5 = input.LA(2);
+                int LA11_5 = input.LA(2);
 
-                if ( (LA10_5==13) ) {
-                    alt10=1;
+                if ( (LA11_5==13) ) {
+                    alt11=1;
                 }
-                else if ( (LA10_5==EOF||(LA10_5>=RULE_STRING && LA10_5<=RULE_DECIMAL)||(LA10_5>=14 && LA10_5<=50)||LA10_5==52||LA10_5==55||LA10_5==59||(LA10_5>=61 && LA10_5<=86)||(LA10_5>=101 && LA10_5<=102)||(LA10_5>=104 && LA10_5<=105)) ) {
-                    alt10=2;
+                else if ( (LA11_5==EOF||(LA11_5>=RULE_STRING && LA11_5<=RULE_DECIMAL)||(LA11_5>=14 && LA11_5<=50)||(LA11_5>=57 && LA11_5<=58)||LA11_5==61||(LA11_5>=63 && LA11_5<=88)||(LA11_5>=103 && LA11_5<=104)||(LA11_5>=106 && LA11_5<=107)) ) {
+                    alt11=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 10, 5, input);
+                        new NoViableAltException("", 11, 5, input);
 
                     throw nvae;
                 }
@@ -8455,14 +8761,12 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             case 40:
             case 49:
             case 50:
-            case 52:
-            case 61:
-            case 65:
-            case 66:
-            case 69:
+            case 57:
+            case 63:
+            case 67:
+            case 68:
             case 71:
-            case 75:
-            case 76:
+            case 73:
             case 77:
             case 78:
             case 79:
@@ -8470,32 +8774,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             case 81:
             case 82:
             case 83:
+            case 84:
             case 85:
-            case 105:
+            case 87:
+            case 107:
                 {
-                alt10=2;
+                alt11=2;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 10, 0, input);
+                    new NoViableAltException("", 11, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt10) {
+            switch (alt11) {
                 case 1 :
-                    // InternalMenuDsl.g:2413:2: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalMenuDsl.g:2490:2: ( ( rule__XAssignment__Group_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2413:2: ( ( rule__XAssignment__Group_0__0 ) )
-                    // InternalMenuDsl.g:2414:3: ( rule__XAssignment__Group_0__0 )
+                    // InternalMenuDsl.g:2490:2: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalMenuDsl.g:2491:3: ( rule__XAssignment__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_0()); 
                     }
-                    // InternalMenuDsl.g:2415:3: ( rule__XAssignment__Group_0__0 )
-                    // InternalMenuDsl.g:2415:4: rule__XAssignment__Group_0__0
+                    // InternalMenuDsl.g:2492:3: ( rule__XAssignment__Group_0__0 )
+                    // InternalMenuDsl.g:2492:4: rule__XAssignment__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_0__0();
@@ -8515,16 +8821,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2419:2: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalMenuDsl.g:2496:2: ( ( rule__XAssignment__Group_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2419:2: ( ( rule__XAssignment__Group_1__0 ) )
-                    // InternalMenuDsl.g:2420:3: ( rule__XAssignment__Group_1__0 )
+                    // InternalMenuDsl.g:2496:2: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalMenuDsl.g:2497:3: ( rule__XAssignment__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_1()); 
                     }
-                    // InternalMenuDsl.g:2421:3: ( rule__XAssignment__Group_1__0 )
-                    // InternalMenuDsl.g:2421:4: rule__XAssignment__Group_1__0
+                    // InternalMenuDsl.g:2498:3: ( rule__XAssignment__Group_1__0 )
+                    // InternalMenuDsl.g:2498:4: rule__XAssignment__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1__0();
@@ -8561,64 +8867,64 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Alternatives"
-    // InternalMenuDsl.g:2429:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
+    // InternalMenuDsl.g:2506:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
     public final void rule__OpMultiAssign__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2433:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
-            int alt11=7;
+            // InternalMenuDsl.g:2510:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
+            int alt12=7;
             switch ( input.LA(1) ) {
             case 16:
                 {
-                alt11=1;
+                alt12=1;
                 }
                 break;
             case 17:
                 {
-                alt11=2;
+                alt12=2;
                 }
                 break;
             case 18:
                 {
-                alt11=3;
+                alt12=3;
                 }
                 break;
             case 19:
                 {
-                alt11=4;
+                alt12=4;
                 }
                 break;
             case 20:
                 {
-                alt11=5;
+                alt12=5;
                 }
                 break;
             case 27:
                 {
-                alt11=6;
+                alt12=6;
                 }
                 break;
             case 26:
                 {
-                alt11=7;
+                alt12=7;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 11, 0, input);
+                    new NoViableAltException("", 12, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt11) {
+            switch (alt12) {
                 case 1 :
-                    // InternalMenuDsl.g:2434:2: ( '+=' )
+                    // InternalMenuDsl.g:2511:2: ( '+=' )
                     {
-                    // InternalMenuDsl.g:2434:2: ( '+=' )
-                    // InternalMenuDsl.g:2435:3: '+='
+                    // InternalMenuDsl.g:2511:2: ( '+=' )
+                    // InternalMenuDsl.g:2512:3: '+='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPlusSignEqualsSignKeyword_0()); 
@@ -8634,10 +8940,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2440:2: ( '-=' )
+                    // InternalMenuDsl.g:2517:2: ( '-=' )
                     {
-                    // InternalMenuDsl.g:2440:2: ( '-=' )
-                    // InternalMenuDsl.g:2441:3: '-='
+                    // InternalMenuDsl.g:2517:2: ( '-=' )
+                    // InternalMenuDsl.g:2518:3: '-='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getHyphenMinusEqualsSignKeyword_1()); 
@@ -8653,10 +8959,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2446:2: ( '*=' )
+                    // InternalMenuDsl.g:2523:2: ( '*=' )
                     {
-                    // InternalMenuDsl.g:2446:2: ( '*=' )
-                    // InternalMenuDsl.g:2447:3: '*='
+                    // InternalMenuDsl.g:2523:2: ( '*=' )
+                    // InternalMenuDsl.g:2524:3: '*='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getAsteriskEqualsSignKeyword_2()); 
@@ -8672,10 +8978,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2452:2: ( '/=' )
+                    // InternalMenuDsl.g:2529:2: ( '/=' )
                     {
-                    // InternalMenuDsl.g:2452:2: ( '/=' )
-                    // InternalMenuDsl.g:2453:3: '/='
+                    // InternalMenuDsl.g:2529:2: ( '/=' )
+                    // InternalMenuDsl.g:2530:3: '/='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getSolidusEqualsSignKeyword_3()); 
@@ -8691,10 +8997,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:2458:2: ( '%=' )
+                    // InternalMenuDsl.g:2535:2: ( '%=' )
                     {
-                    // InternalMenuDsl.g:2458:2: ( '%=' )
-                    // InternalMenuDsl.g:2459:3: '%='
+                    // InternalMenuDsl.g:2535:2: ( '%=' )
+                    // InternalMenuDsl.g:2536:3: '%='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPercentSignEqualsSignKeyword_4()); 
@@ -8710,16 +9016,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:2464:2: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalMenuDsl.g:2541:2: ( ( rule__OpMultiAssign__Group_5__0 ) )
                     {
-                    // InternalMenuDsl.g:2464:2: ( ( rule__OpMultiAssign__Group_5__0 ) )
-                    // InternalMenuDsl.g:2465:3: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalMenuDsl.g:2541:2: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalMenuDsl.g:2542:3: ( rule__OpMultiAssign__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_5()); 
                     }
-                    // InternalMenuDsl.g:2466:3: ( rule__OpMultiAssign__Group_5__0 )
-                    // InternalMenuDsl.g:2466:4: rule__OpMultiAssign__Group_5__0
+                    // InternalMenuDsl.g:2543:3: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalMenuDsl.g:2543:4: rule__OpMultiAssign__Group_5__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_5__0();
@@ -8739,16 +9045,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:2470:2: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalMenuDsl.g:2547:2: ( ( rule__OpMultiAssign__Group_6__0 ) )
                     {
-                    // InternalMenuDsl.g:2470:2: ( ( rule__OpMultiAssign__Group_6__0 ) )
-                    // InternalMenuDsl.g:2471:3: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalMenuDsl.g:2547:2: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalMenuDsl.g:2548:3: ( rule__OpMultiAssign__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_6()); 
                     }
-                    // InternalMenuDsl.g:2472:3: ( rule__OpMultiAssign__Group_6__0 )
-                    // InternalMenuDsl.g:2472:4: rule__OpMultiAssign__Group_6__0
+                    // InternalMenuDsl.g:2549:3: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalMenuDsl.g:2549:4: rule__OpMultiAssign__Group_6__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_6__0();
@@ -8785,49 +9091,49 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpEquality__Alternatives"
-    // InternalMenuDsl.g:2480:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
+    // InternalMenuDsl.g:2557:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
     public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2484:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
-            int alt12=4;
+            // InternalMenuDsl.g:2561:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
+            int alt13=4;
             switch ( input.LA(1) ) {
             case 21:
                 {
-                alt12=1;
+                alt13=1;
                 }
                 break;
             case 22:
                 {
-                alt12=2;
+                alt13=2;
                 }
                 break;
             case 23:
                 {
-                alt12=3;
+                alt13=3;
                 }
                 break;
             case 24:
                 {
-                alt12=4;
+                alt13=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 12, 0, input);
+                    new NoViableAltException("", 13, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt12) {
+            switch (alt13) {
                 case 1 :
-                    // InternalMenuDsl.g:2485:2: ( '==' )
+                    // InternalMenuDsl.g:2562:2: ( '==' )
                     {
-                    // InternalMenuDsl.g:2485:2: ( '==' )
-                    // InternalMenuDsl.g:2486:3: '=='
+                    // InternalMenuDsl.g:2562:2: ( '==' )
+                    // InternalMenuDsl.g:2563:3: '=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignKeyword_0()); 
@@ -8843,10 +9149,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2491:2: ( '!=' )
+                    // InternalMenuDsl.g:2568:2: ( '!=' )
                     {
-                    // InternalMenuDsl.g:2491:2: ( '!=' )
-                    // InternalMenuDsl.g:2492:3: '!='
+                    // InternalMenuDsl.g:2568:2: ( '!=' )
+                    // InternalMenuDsl.g:2569:3: '!='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignKeyword_1()); 
@@ -8862,10 +9168,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2497:2: ( '===' )
+                    // InternalMenuDsl.g:2574:2: ( '===' )
                     {
-                    // InternalMenuDsl.g:2497:2: ( '===' )
-                    // InternalMenuDsl.g:2498:3: '==='
+                    // InternalMenuDsl.g:2574:2: ( '===' )
+                    // InternalMenuDsl.g:2575:3: '==='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); 
@@ -8881,10 +9187,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2503:2: ( '!==' )
+                    // InternalMenuDsl.g:2580:2: ( '!==' )
                     {
-                    // InternalMenuDsl.g:2503:2: ( '!==' )
-                    // InternalMenuDsl.g:2504:3: '!=='
+                    // InternalMenuDsl.g:2580:2: ( '!==' )
+                    // InternalMenuDsl.g:2581:3: '!=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); 
@@ -8917,41 +9223,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Alternatives_1"
-    // InternalMenuDsl.g:2513:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
+    // InternalMenuDsl.g:2590:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
     public final void rule__XRelationalExpression__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2517:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            // InternalMenuDsl.g:2594:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
+            int alt14=2;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA13_0==67) ) {
-                alt13=1;
+            if ( (LA14_0==69) ) {
+                alt14=1;
             }
-            else if ( ((LA13_0>=25 && LA13_0<=27)) ) {
-                alt13=2;
+            else if ( ((LA14_0>=25 && LA14_0<=27)) ) {
+                alt14=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
+                    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
-            switch (alt13) {
+            switch (alt14) {
                 case 1 :
-                    // InternalMenuDsl.g:2518:2: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalMenuDsl.g:2595:2: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2518:2: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
-                    // InternalMenuDsl.g:2519:3: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalMenuDsl.g:2595:2: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalMenuDsl.g:2596:3: ( rule__XRelationalExpression__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0()); 
                     }
-                    // InternalMenuDsl.g:2520:3: ( rule__XRelationalExpression__Group_1_0__0 )
-                    // InternalMenuDsl.g:2520:4: rule__XRelationalExpression__Group_1_0__0
+                    // InternalMenuDsl.g:2597:3: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalMenuDsl.g:2597:4: rule__XRelationalExpression__Group_1_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_0__0();
@@ -8971,16 +9277,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2524:2: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalMenuDsl.g:2601:2: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2524:2: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
-                    // InternalMenuDsl.g:2525:3: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalMenuDsl.g:2601:2: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalMenuDsl.g:2602:3: ( rule__XRelationalExpression__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1()); 
                     }
-                    // InternalMenuDsl.g:2526:3: ( rule__XRelationalExpression__Group_1_1__0 )
-                    // InternalMenuDsl.g:2526:4: rule__XRelationalExpression__Group_1_1__0
+                    // InternalMenuDsl.g:2603:3: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalMenuDsl.g:2603:4: rule__XRelationalExpression__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_1__0();
@@ -9017,34 +9323,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpCompare__Alternatives"
-    // InternalMenuDsl.g:2534:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
+    // InternalMenuDsl.g:2611:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
     public final void rule__OpCompare__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2538:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
-            int alt14=4;
+            // InternalMenuDsl.g:2615:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
+            int alt15=4;
             switch ( input.LA(1) ) {
             case 25:
                 {
-                alt14=1;
+                alt15=1;
                 }
                 break;
             case 27:
                 {
-                int LA14_2 = input.LA(2);
+                int LA15_2 = input.LA(2);
 
-                if ( (LA14_2==EOF||(LA14_2>=RULE_STRING && LA14_2<=RULE_DECIMAL)||LA14_2==27||(LA14_2>=34 && LA14_2<=35)||LA14_2==40||(LA14_2>=45 && LA14_2<=50)||LA14_2==52||LA14_2==61||(LA14_2>=65 && LA14_2<=66)||LA14_2==69||LA14_2==71||(LA14_2>=75 && LA14_2<=83)||LA14_2==85||LA14_2==105) ) {
-                    alt14=4;
+                if ( (LA15_2==EOF||(LA15_2>=RULE_STRING && LA15_2<=RULE_DECIMAL)||LA15_2==27||(LA15_2>=34 && LA15_2<=35)||LA15_2==40||(LA15_2>=45 && LA15_2<=50)||LA15_2==57||LA15_2==63||(LA15_2>=67 && LA15_2<=68)||LA15_2==71||LA15_2==73||(LA15_2>=77 && LA15_2<=85)||LA15_2==87||LA15_2==107) ) {
+                    alt15=4;
                 }
-                else if ( (LA14_2==13) ) {
-                    alt14=2;
+                else if ( (LA15_2==13) ) {
+                    alt15=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 14, 2, input);
+                        new NoViableAltException("", 15, 2, input);
 
                     throw nvae;
                 }
@@ -9052,23 +9358,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 break;
             case 26:
                 {
-                alt14=3;
+                alt15=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 14, 0, input);
+                    new NoViableAltException("", 15, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt14) {
+            switch (alt15) {
                 case 1 :
-                    // InternalMenuDsl.g:2539:2: ( '>=' )
+                    // InternalMenuDsl.g:2616:2: ( '>=' )
                     {
-                    // InternalMenuDsl.g:2539:2: ( '>=' )
-                    // InternalMenuDsl.g:2540:3: '>='
+                    // InternalMenuDsl.g:2616:2: ( '>=' )
+                    // InternalMenuDsl.g:2617:3: '>='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignEqualsSignKeyword_0()); 
@@ -9084,16 +9390,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2545:2: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalMenuDsl.g:2622:2: ( ( rule__OpCompare__Group_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2545:2: ( ( rule__OpCompare__Group_1__0 ) )
-                    // InternalMenuDsl.g:2546:3: ( rule__OpCompare__Group_1__0 )
+                    // InternalMenuDsl.g:2622:2: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalMenuDsl.g:2623:3: ( rule__OpCompare__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGroup_1()); 
                     }
-                    // InternalMenuDsl.g:2547:3: ( rule__OpCompare__Group_1__0 )
-                    // InternalMenuDsl.g:2547:4: rule__OpCompare__Group_1__0
+                    // InternalMenuDsl.g:2624:3: ( rule__OpCompare__Group_1__0 )
+                    // InternalMenuDsl.g:2624:4: rule__OpCompare__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpCompare__Group_1__0();
@@ -9113,10 +9419,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2551:2: ( '>' )
+                    // InternalMenuDsl.g:2628:2: ( '>' )
                     {
-                    // InternalMenuDsl.g:2551:2: ( '>' )
-                    // InternalMenuDsl.g:2552:3: '>'
+                    // InternalMenuDsl.g:2628:2: ( '>' )
+                    // InternalMenuDsl.g:2629:3: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignKeyword_2()); 
@@ -9132,10 +9438,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2557:2: ( '<' )
+                    // InternalMenuDsl.g:2634:2: ( '<' )
                     {
-                    // InternalMenuDsl.g:2557:2: ( '<' )
-                    // InternalMenuDsl.g:2558:3: '<'
+                    // InternalMenuDsl.g:2634:2: ( '<' )
+                    // InternalMenuDsl.g:2635:3: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_3()); 
@@ -9168,21 +9474,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Alternatives"
-    // InternalMenuDsl.g:2567:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
+    // InternalMenuDsl.g:2644:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
     public final void rule__OpOther__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2571:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
-            int alt15=9;
-            alt15 = dfa15.predict(input);
-            switch (alt15) {
+            // InternalMenuDsl.g:2648:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
+            int alt16=9;
+            alt16 = dfa16.predict(input);
+            switch (alt16) {
                 case 1 :
-                    // InternalMenuDsl.g:2572:2: ( '->' )
+                    // InternalMenuDsl.g:2649:2: ( '->' )
                     {
-                    // InternalMenuDsl.g:2572:2: ( '->' )
-                    // InternalMenuDsl.g:2573:3: '->'
+                    // InternalMenuDsl.g:2649:2: ( '->' )
+                    // InternalMenuDsl.g:2650:3: '->'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getHyphenMinusGreaterThanSignKeyword_0()); 
@@ -9198,10 +9504,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2578:2: ( '..<' )
+                    // InternalMenuDsl.g:2655:2: ( '..<' )
                     {
-                    // InternalMenuDsl.g:2578:2: ( '..<' )
-                    // InternalMenuDsl.g:2579:3: '..<'
+                    // InternalMenuDsl.g:2655:2: ( '..<' )
+                    // InternalMenuDsl.g:2656:3: '..<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopLessThanSignKeyword_1()); 
@@ -9217,16 +9523,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2584:2: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalMenuDsl.g:2661:2: ( ( rule__OpOther__Group_2__0 ) )
                     {
-                    // InternalMenuDsl.g:2584:2: ( ( rule__OpOther__Group_2__0 ) )
-                    // InternalMenuDsl.g:2585:3: ( rule__OpOther__Group_2__0 )
+                    // InternalMenuDsl.g:2661:2: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalMenuDsl.g:2662:3: ( rule__OpOther__Group_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_2()); 
                     }
-                    // InternalMenuDsl.g:2586:3: ( rule__OpOther__Group_2__0 )
-                    // InternalMenuDsl.g:2586:4: rule__OpOther__Group_2__0
+                    // InternalMenuDsl.g:2663:3: ( rule__OpOther__Group_2__0 )
+                    // InternalMenuDsl.g:2663:4: rule__OpOther__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpOther__Group_2__0();
@@ -9246,10 +9552,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2590:2: ( '..' )
+                    // InternalMenuDsl.g:2667:2: ( '..' )
                     {
-                    // InternalMenuDsl.g:2590:2: ( '..' )
-                    // InternalMenuDsl.g:2591:3: '..'
+                    // InternalMenuDsl.g:2667:2: ( '..' )
+                    // InternalMenuDsl.g:2668:3: '..'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_3()); 
@@ -9265,10 +9571,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:2596:2: ( '=>' )
+                    // InternalMenuDsl.g:2673:2: ( '=>' )
                     {
-                    // InternalMenuDsl.g:2596:2: ( '=>' )
-                    // InternalMenuDsl.g:2597:3: '=>'
+                    // InternalMenuDsl.g:2673:2: ( '=>' )
+                    // InternalMenuDsl.g:2674:3: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_4()); 
@@ -9284,16 +9590,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:2602:2: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalMenuDsl.g:2679:2: ( ( rule__OpOther__Group_5__0 ) )
                     {
-                    // InternalMenuDsl.g:2602:2: ( ( rule__OpOther__Group_5__0 ) )
-                    // InternalMenuDsl.g:2603:3: ( rule__OpOther__Group_5__0 )
+                    // InternalMenuDsl.g:2679:2: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalMenuDsl.g:2680:3: ( rule__OpOther__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5()); 
                     }
-                    // InternalMenuDsl.g:2604:3: ( rule__OpOther__Group_5__0 )
-                    // InternalMenuDsl.g:2604:4: rule__OpOther__Group_5__0
+                    // InternalMenuDsl.g:2681:3: ( rule__OpOther__Group_5__0 )
+                    // InternalMenuDsl.g:2681:4: rule__OpOther__Group_5__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5__0();
@@ -9313,16 +9619,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:2608:2: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalMenuDsl.g:2685:2: ( ( rule__OpOther__Group_6__0 ) )
                     {
-                    // InternalMenuDsl.g:2608:2: ( ( rule__OpOther__Group_6__0 ) )
-                    // InternalMenuDsl.g:2609:3: ( rule__OpOther__Group_6__0 )
+                    // InternalMenuDsl.g:2685:2: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalMenuDsl.g:2686:3: ( rule__OpOther__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6()); 
                     }
-                    // InternalMenuDsl.g:2610:3: ( rule__OpOther__Group_6__0 )
-                    // InternalMenuDsl.g:2610:4: rule__OpOther__Group_6__0
+                    // InternalMenuDsl.g:2687:3: ( rule__OpOther__Group_6__0 )
+                    // InternalMenuDsl.g:2687:4: rule__OpOther__Group_6__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6__0();
@@ -9342,10 +9648,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 8 :
-                    // InternalMenuDsl.g:2614:2: ( '<>' )
+                    // InternalMenuDsl.g:2691:2: ( '<>' )
                     {
-                    // InternalMenuDsl.g:2614:2: ( '<>' )
-                    // InternalMenuDsl.g:2615:3: '<>'
+                    // InternalMenuDsl.g:2691:2: ( '<>' )
+                    // InternalMenuDsl.g:2692:3: '<>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignGreaterThanSignKeyword_7()); 
@@ -9361,10 +9667,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 9 :
-                    // InternalMenuDsl.g:2620:2: ( '?:' )
+                    // InternalMenuDsl.g:2697:2: ( '?:' )
                     {
-                    // InternalMenuDsl.g:2620:2: ( '?:' )
-                    // InternalMenuDsl.g:2621:3: '?:'
+                    // InternalMenuDsl.g:2697:2: ( '?:' )
+                    // InternalMenuDsl.g:2698:3: '?:'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getQuestionMarkColonKeyword_8()); 
@@ -9397,29 +9703,29 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Alternatives_5_1"
-    // InternalMenuDsl.g:2630:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
+    // InternalMenuDsl.g:2707:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
     public final void rule__OpOther__Alternatives_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2634:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
-            int alt16=2;
-            int LA16_0 = input.LA(1);
+            // InternalMenuDsl.g:2711:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
+            int alt17=2;
+            int LA17_0 = input.LA(1);
 
-            if ( (LA16_0==26) ) {
-                int LA16_1 = input.LA(2);
+            if ( (LA17_0==26) ) {
+                int LA17_1 = input.LA(2);
 
-                if ( (LA16_1==26) ) {
-                    alt16=1;
+                if ( (LA17_1==EOF||(LA17_1>=RULE_STRING && LA17_1<=RULE_DECIMAL)||LA17_1==27||(LA17_1>=34 && LA17_1<=35)||LA17_1==40||(LA17_1>=45 && LA17_1<=50)||LA17_1==57||LA17_1==63||(LA17_1>=67 && LA17_1<=68)||LA17_1==71||LA17_1==73||(LA17_1>=77 && LA17_1<=85)||LA17_1==87||LA17_1==107) ) {
+                    alt17=2;
                 }
-                else if ( (LA16_1==EOF||(LA16_1>=RULE_STRING && LA16_1<=RULE_DECIMAL)||LA16_1==27||(LA16_1>=34 && LA16_1<=35)||LA16_1==40||(LA16_1>=45 && LA16_1<=50)||LA16_1==52||LA16_1==61||(LA16_1>=65 && LA16_1<=66)||LA16_1==69||LA16_1==71||(LA16_1>=75 && LA16_1<=83)||LA16_1==85||LA16_1==105) ) {
-                    alt16=2;
+                else if ( (LA17_1==26) ) {
+                    alt17=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 16, 1, input);
+                        new NoViableAltException("", 17, 1, input);
 
                     throw nvae;
                 }
@@ -9427,22 +9733,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 16, 0, input);
+                    new NoViableAltException("", 17, 0, input);
 
                 throw nvae;
             }
-            switch (alt16) {
+            switch (alt17) {
                 case 1 :
-                    // InternalMenuDsl.g:2635:2: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalMenuDsl.g:2712:2: ( ( rule__OpOther__Group_5_1_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2635:2: ( ( rule__OpOther__Group_5_1_0__0 ) )
-                    // InternalMenuDsl.g:2636:3: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalMenuDsl.g:2712:2: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalMenuDsl.g:2713:3: ( rule__OpOther__Group_5_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5_1_0()); 
                     }
-                    // InternalMenuDsl.g:2637:3: ( rule__OpOther__Group_5_1_0__0 )
-                    // InternalMenuDsl.g:2637:4: rule__OpOther__Group_5_1_0__0
+                    // InternalMenuDsl.g:2714:3: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalMenuDsl.g:2714:4: rule__OpOther__Group_5_1_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5_1_0__0();
@@ -9462,10 +9768,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2641:2: ( '>' )
+                    // InternalMenuDsl.g:2718:2: ( '>' )
                     {
-                    // InternalMenuDsl.g:2641:2: ( '>' )
-                    // InternalMenuDsl.g:2642:3: '>'
+                    // InternalMenuDsl.g:2718:2: ( '>' )
+                    // InternalMenuDsl.g:2719:3: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_1()); 
@@ -9498,55 +9804,55 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Alternatives_6_1"
-    // InternalMenuDsl.g:2651:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
+    // InternalMenuDsl.g:2728:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
     public final void rule__OpOther__Alternatives_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2655:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
-            int alt17=3;
-            int LA17_0 = input.LA(1);
+            // InternalMenuDsl.g:2732:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
+            int alt18=3;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA17_0==27) ) {
-                int LA17_1 = input.LA(2);
+            if ( (LA18_0==27) ) {
+                int LA18_1 = input.LA(2);
 
-                if ( (synpred39_InternalMenuDsl()) ) {
-                    alt17=1;
+                if ( (synpred41_InternalMenuDsl()) ) {
+                    alt18=1;
                 }
-                else if ( (synpred40_InternalMenuDsl()) ) {
-                    alt17=2;
+                else if ( (synpred42_InternalMenuDsl()) ) {
+                    alt18=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 17, 1, input);
+                        new NoViableAltException("", 18, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA17_0==31) ) {
-                alt17=3;
+            else if ( (LA18_0==31) ) {
+                alt18=3;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 17, 0, input);
+                    new NoViableAltException("", 18, 0, input);
 
                 throw nvae;
             }
-            switch (alt17) {
+            switch (alt18) {
                 case 1 :
-                    // InternalMenuDsl.g:2656:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalMenuDsl.g:2733:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2656:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
-                    // InternalMenuDsl.g:2657:3: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalMenuDsl.g:2733:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalMenuDsl.g:2734:3: ( rule__OpOther__Group_6_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
                     }
-                    // InternalMenuDsl.g:2658:3: ( rule__OpOther__Group_6_1_0__0 )
-                    // InternalMenuDsl.g:2658:4: rule__OpOther__Group_6_1_0__0
+                    // InternalMenuDsl.g:2735:3: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalMenuDsl.g:2735:4: rule__OpOther__Group_6_1_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6_1_0__0();
@@ -9566,10 +9872,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2662:2: ( '<' )
+                    // InternalMenuDsl.g:2739:2: ( '<' )
                     {
-                    // InternalMenuDsl.g:2662:2: ( '<' )
-                    // InternalMenuDsl.g:2663:3: '<'
+                    // InternalMenuDsl.g:2739:2: ( '<' )
+                    // InternalMenuDsl.g:2740:3: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
@@ -9585,10 +9891,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2668:2: ( '=>' )
+                    // InternalMenuDsl.g:2745:2: ( '=>' )
                     {
-                    // InternalMenuDsl.g:2668:2: ( '=>' )
-                    // InternalMenuDsl.g:2669:3: '=>'
+                    // InternalMenuDsl.g:2745:2: ( '=>' )
+                    // InternalMenuDsl.g:2746:3: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_6_1_2()); 
@@ -9621,35 +9927,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpAdd__Alternatives"
-    // InternalMenuDsl.g:2678:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
+    // InternalMenuDsl.g:2755:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
     public final void rule__OpAdd__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2682:1: ( ( '+' ) | ( '-' ) )
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // InternalMenuDsl.g:2759:1: ( ( '+' ) | ( '-' ) )
+            int alt19=2;
+            int LA19_0 = input.LA(1);
 
-            if ( (LA18_0==34) ) {
-                alt18=1;
+            if ( (LA19_0==34) ) {
+                alt19=1;
             }
-            else if ( (LA18_0==35) ) {
-                alt18=2;
+            else if ( (LA19_0==35) ) {
+                alt19=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 18, 0, input);
+                    new NoViableAltException("", 19, 0, input);
 
                 throw nvae;
             }
-            switch (alt18) {
+            switch (alt19) {
                 case 1 :
-                    // InternalMenuDsl.g:2683:2: ( '+' )
+                    // InternalMenuDsl.g:2760:2: ( '+' )
                     {
-                    // InternalMenuDsl.g:2683:2: ( '+' )
-                    // InternalMenuDsl.g:2684:3: '+'
+                    // InternalMenuDsl.g:2760:2: ( '+' )
+                    // InternalMenuDsl.g:2761:3: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getPlusSignKeyword_0()); 
@@ -9665,10 +9971,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2689:2: ( '-' )
+                    // InternalMenuDsl.g:2766:2: ( '-' )
                     {
-                    // InternalMenuDsl.g:2689:2: ( '-' )
-                    // InternalMenuDsl.g:2690:3: '-'
+                    // InternalMenuDsl.g:2766:2: ( '-' )
+                    // InternalMenuDsl.g:2767:3: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getHyphenMinusKeyword_1()); 
@@ -9701,49 +10007,49 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMulti__Alternatives"
-    // InternalMenuDsl.g:2699:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
+    // InternalMenuDsl.g:2776:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
     public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2703:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
-            int alt19=4;
+            // InternalMenuDsl.g:2780:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
+            int alt20=4;
             switch ( input.LA(1) ) {
             case 36:
                 {
-                alt19=1;
+                alt20=1;
                 }
                 break;
             case 37:
                 {
-                alt19=2;
+                alt20=2;
                 }
                 break;
             case 38:
                 {
-                alt19=3;
+                alt20=3;
                 }
                 break;
             case 39:
                 {
-                alt19=4;
+                alt20=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 19, 0, input);
+                    new NoViableAltException("", 20, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt19) {
+            switch (alt20) {
                 case 1 :
-                    // InternalMenuDsl.g:2704:2: ( '*' )
+                    // InternalMenuDsl.g:2781:2: ( '*' )
                     {
-                    // InternalMenuDsl.g:2704:2: ( '*' )
-                    // InternalMenuDsl.g:2705:3: '*'
+                    // InternalMenuDsl.g:2781:2: ( '*' )
+                    // InternalMenuDsl.g:2782:3: '*'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskKeyword_0()); 
@@ -9759,10 +10065,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2710:2: ( '**' )
+                    // InternalMenuDsl.g:2787:2: ( '**' )
                     {
-                    // InternalMenuDsl.g:2710:2: ( '**' )
-                    // InternalMenuDsl.g:2711:3: '**'
+                    // InternalMenuDsl.g:2787:2: ( '**' )
+                    // InternalMenuDsl.g:2788:3: '**'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskAsteriskKeyword_1()); 
@@ -9778,10 +10084,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2716:2: ( '/' )
+                    // InternalMenuDsl.g:2793:2: ( '/' )
                     {
-                    // InternalMenuDsl.g:2716:2: ( '/' )
-                    // InternalMenuDsl.g:2717:3: '/'
+                    // InternalMenuDsl.g:2793:2: ( '/' )
+                    // InternalMenuDsl.g:2794:3: '/'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getSolidusKeyword_2()); 
@@ -9797,10 +10103,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2722:2: ( '%' )
+                    // InternalMenuDsl.g:2799:2: ( '%' )
                     {
-                    // InternalMenuDsl.g:2722:2: ( '%' )
-                    // InternalMenuDsl.g:2723:3: '%'
+                    // InternalMenuDsl.g:2799:2: ( '%' )
+                    // InternalMenuDsl.g:2800:3: '%'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getPercentSignKeyword_3()); 
@@ -9833,41 +10139,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__Alternatives"
-    // InternalMenuDsl.g:2732:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
+    // InternalMenuDsl.g:2809:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
     public final void rule__XUnaryOperation__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2736:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalMenuDsl.g:2813:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
+            int alt21=2;
+            int LA21_0 = input.LA(1);
 
-            if ( ((LA20_0>=34 && LA20_0<=35)||LA20_0==40) ) {
-                alt20=1;
+            if ( ((LA21_0>=34 && LA21_0<=35)||LA21_0==40) ) {
+                alt21=1;
             }
-            else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_DECIMAL)||LA20_0==27||(LA20_0>=45 && LA20_0<=50)||LA20_0==52||LA20_0==61||(LA20_0>=65 && LA20_0<=66)||LA20_0==69||LA20_0==71||(LA20_0>=75 && LA20_0<=83)||LA20_0==85||LA20_0==105) ) {
-                alt20=2;
+            else if ( ((LA21_0>=RULE_STRING && LA21_0<=RULE_DECIMAL)||LA21_0==27||(LA21_0>=45 && LA21_0<=50)||LA21_0==57||LA21_0==63||(LA21_0>=67 && LA21_0<=68)||LA21_0==71||LA21_0==73||(LA21_0>=77 && LA21_0<=85)||LA21_0==87||LA21_0==107) ) {
+                alt21=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 20, 0, input);
+                    new NoViableAltException("", 21, 0, input);
 
                 throw nvae;
             }
-            switch (alt20) {
+            switch (alt21) {
                 case 1 :
-                    // InternalMenuDsl.g:2737:2: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalMenuDsl.g:2814:2: ( ( rule__XUnaryOperation__Group_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2737:2: ( ( rule__XUnaryOperation__Group_0__0 ) )
-                    // InternalMenuDsl.g:2738:3: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalMenuDsl.g:2814:2: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalMenuDsl.g:2815:3: ( rule__XUnaryOperation__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getGroup_0()); 
                     }
-                    // InternalMenuDsl.g:2739:3: ( rule__XUnaryOperation__Group_0__0 )
-                    // InternalMenuDsl.g:2739:4: rule__XUnaryOperation__Group_0__0
+                    // InternalMenuDsl.g:2816:3: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalMenuDsl.g:2816:4: rule__XUnaryOperation__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XUnaryOperation__Group_0__0();
@@ -9887,10 +10193,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2743:2: ( ruleXCastedExpression )
+                    // InternalMenuDsl.g:2820:2: ( ruleXCastedExpression )
                     {
-                    // InternalMenuDsl.g:2743:2: ( ruleXCastedExpression )
-                    // InternalMenuDsl.g:2744:3: ruleXCastedExpression
+                    // InternalMenuDsl.g:2820:2: ( ruleXCastedExpression )
+                    // InternalMenuDsl.g:2821:3: ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
@@ -9927,44 +10233,44 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpUnary__Alternatives"
-    // InternalMenuDsl.g:2753:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
+    // InternalMenuDsl.g:2830:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
     public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2757:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
-            int alt21=3;
+            // InternalMenuDsl.g:2834:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
+            int alt22=3;
             switch ( input.LA(1) ) {
             case 40:
                 {
-                alt21=1;
+                alt22=1;
                 }
                 break;
             case 35:
                 {
-                alt21=2;
+                alt22=2;
                 }
                 break;
             case 34:
                 {
-                alt21=3;
+                alt22=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 21, 0, input);
+                    new NoViableAltException("", 22, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt21) {
+            switch (alt22) {
                 case 1 :
-                    // InternalMenuDsl.g:2758:2: ( '!' )
+                    // InternalMenuDsl.g:2835:2: ( '!' )
                     {
-                    // InternalMenuDsl.g:2758:2: ( '!' )
-                    // InternalMenuDsl.g:2759:3: '!'
+                    // InternalMenuDsl.g:2835:2: ( '!' )
+                    // InternalMenuDsl.g:2836:3: '!'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getExclamationMarkKeyword_0()); 
@@ -9980,10 +10286,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2764:2: ( '-' )
+                    // InternalMenuDsl.g:2841:2: ( '-' )
                     {
-                    // InternalMenuDsl.g:2764:2: ( '-' )
-                    // InternalMenuDsl.g:2765:3: '-'
+                    // InternalMenuDsl.g:2841:2: ( '-' )
+                    // InternalMenuDsl.g:2842:3: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getHyphenMinusKeyword_1()); 
@@ -9999,10 +10305,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2770:2: ( '+' )
+                    // InternalMenuDsl.g:2847:2: ( '+' )
                     {
-                    // InternalMenuDsl.g:2770:2: ( '+' )
-                    // InternalMenuDsl.g:2771:3: '+'
+                    // InternalMenuDsl.g:2847:2: ( '+' )
+                    // InternalMenuDsl.g:2848:3: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getPlusSignKeyword_2()); 
@@ -10035,35 +10341,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpPostfix__Alternatives"
-    // InternalMenuDsl.g:2780:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
+    // InternalMenuDsl.g:2857:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
     public final void rule__OpPostfix__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2784:1: ( ( '++' ) | ( '--' ) )
-            int alt22=2;
-            int LA22_0 = input.LA(1);
+            // InternalMenuDsl.g:2861:1: ( ( '++' ) | ( '--' ) )
+            int alt23=2;
+            int LA23_0 = input.LA(1);
 
-            if ( (LA22_0==41) ) {
-                alt22=1;
+            if ( (LA23_0==41) ) {
+                alt23=1;
             }
-            else if ( (LA22_0==42) ) {
-                alt22=2;
+            else if ( (LA23_0==42) ) {
+                alt23=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 22, 0, input);
+                    new NoViableAltException("", 23, 0, input);
 
                 throw nvae;
             }
-            switch (alt22) {
+            switch (alt23) {
                 case 1 :
-                    // InternalMenuDsl.g:2785:2: ( '++' )
+                    // InternalMenuDsl.g:2862:2: ( '++' )
                     {
-                    // InternalMenuDsl.g:2785:2: ( '++' )
-                    // InternalMenuDsl.g:2786:3: '++'
+                    // InternalMenuDsl.g:2862:2: ( '++' )
+                    // InternalMenuDsl.g:2863:3: '++'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getPlusSignPlusSignKeyword_0()); 
@@ -10079,10 +10385,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2791:2: ( '--' )
+                    // InternalMenuDsl.g:2868:2: ( '--' )
                     {
-                    // InternalMenuDsl.g:2791:2: ( '--' )
-                    // InternalMenuDsl.g:2792:3: '--'
+                    // InternalMenuDsl.g:2868:2: ( '--' )
+                    // InternalMenuDsl.g:2869:3: '--'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getHyphenMinusHyphenMinusKeyword_1()); 
@@ -10115,27 +10421,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1"
-    // InternalMenuDsl.g:2801:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
+    // InternalMenuDsl.g:2878:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2805:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
-            int alt23=2;
-            alt23 = dfa23.predict(input);
-            switch (alt23) {
+            // InternalMenuDsl.g:2882:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
+            int alt24=2;
+            alt24 = dfa24.predict(input);
+            switch (alt24) {
                 case 1 :
-                    // InternalMenuDsl.g:2806:2: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalMenuDsl.g:2883:2: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
                     {
-                    // InternalMenuDsl.g:2806:2: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
-                    // InternalMenuDsl.g:2807:3: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalMenuDsl.g:2883:2: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalMenuDsl.g:2884:3: ( rule__XMemberFeatureCall__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0()); 
                     }
-                    // InternalMenuDsl.g:2808:3: ( rule__XMemberFeatureCall__Group_1_0__0 )
-                    // InternalMenuDsl.g:2808:4: rule__XMemberFeatureCall__Group_1_0__0
+                    // InternalMenuDsl.g:2885:3: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalMenuDsl.g:2885:4: rule__XMemberFeatureCall__Group_1_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_0__0();
@@ -10155,16 +10461,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2812:2: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalMenuDsl.g:2889:2: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2812:2: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
-                    // InternalMenuDsl.g:2813:3: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalMenuDsl.g:2889:2: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalMenuDsl.g:2890:3: ( rule__XMemberFeatureCall__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1()); 
                     }
-                    // InternalMenuDsl.g:2814:3: ( rule__XMemberFeatureCall__Group_1_1__0 )
-                    // InternalMenuDsl.g:2814:4: rule__XMemberFeatureCall__Group_1_1__0
+                    // InternalMenuDsl.g:2891:3: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalMenuDsl.g:2891:4: rule__XMemberFeatureCall__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1__0();
@@ -10201,35 +10507,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_0_0_0_1"
-    // InternalMenuDsl.g:2822:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
+    // InternalMenuDsl.g:2899:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2826:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
-            int alt24=2;
-            int LA24_0 = input.LA(1);
+            // InternalMenuDsl.g:2903:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA24_0==43) ) {
-                alt24=1;
+            if ( (LA25_0==43) ) {
+                alt25=1;
             }
-            else if ( (LA24_0==101) ) {
-                alt24=2;
+            else if ( (LA25_0==103) ) {
+                alt25=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 24, 0, input);
+                    new NoViableAltException("", 25, 0, input);
 
                 throw nvae;
             }
-            switch (alt24) {
+            switch (alt25) {
                 case 1 :
-                    // InternalMenuDsl.g:2827:2: ( '.' )
+                    // InternalMenuDsl.g:2904:2: ( '.' )
                     {
-                    // InternalMenuDsl.g:2827:2: ( '.' )
-                    // InternalMenuDsl.g:2828:3: '.'
+                    // InternalMenuDsl.g:2904:2: ( '.' )
+                    // InternalMenuDsl.g:2905:3: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); 
@@ -10245,16 +10551,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2833:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalMenuDsl.g:2910:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
                     {
-                    // InternalMenuDsl.g:2833:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
-                    // InternalMenuDsl.g:2834:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalMenuDsl.g:2910:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalMenuDsl.g:2911:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_0_0_0_1_1()); 
                     }
-                    // InternalMenuDsl.g:2835:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
-                    // InternalMenuDsl.g:2835:4: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
+                    // InternalMenuDsl.g:2912:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalMenuDsl.g:2912:4: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1();
@@ -10291,44 +10597,44 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_0_0_1"
-    // InternalMenuDsl.g:2843:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
+    // InternalMenuDsl.g:2920:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2847:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
-            int alt25=3;
+            // InternalMenuDsl.g:2924:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
+            int alt26=3;
             switch ( input.LA(1) ) {
             case 43:
                 {
-                alt25=1;
+                alt26=1;
                 }
                 break;
-            case 102:
+            case 104:
                 {
-                alt25=2;
+                alt26=2;
                 }
                 break;
-            case 101:
+            case 103:
                 {
-                alt25=3;
+                alt26=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 25, 0, input);
+                    new NoViableAltException("", 26, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt25) {
+            switch (alt26) {
                 case 1 :
-                    // InternalMenuDsl.g:2848:2: ( '.' )
+                    // InternalMenuDsl.g:2925:2: ( '.' )
                     {
-                    // InternalMenuDsl.g:2848:2: ( '.' )
-                    // InternalMenuDsl.g:2849:3: '.'
+                    // InternalMenuDsl.g:2925:2: ( '.' )
+                    // InternalMenuDsl.g:2926:3: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); 
@@ -10344,16 +10650,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2854:2: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalMenuDsl.g:2931:2: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
                     {
-                    // InternalMenuDsl.g:2854:2: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
-                    // InternalMenuDsl.g:2855:3: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalMenuDsl.g:2931:2: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalMenuDsl.g:2932:3: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeAssignment_1_1_0_0_1_1()); 
                     }
-                    // InternalMenuDsl.g:2856:3: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
-                    // InternalMenuDsl.g:2856:4: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
+                    // InternalMenuDsl.g:2933:3: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalMenuDsl.g:2933:4: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1();
@@ -10373,16 +10679,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2860:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalMenuDsl.g:2937:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
                     {
-                    // InternalMenuDsl.g:2860:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
-                    // InternalMenuDsl.g:2861:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalMenuDsl.g:2937:2: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalMenuDsl.g:2938:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_1_0_0_1_2()); 
                     }
-                    // InternalMenuDsl.g:2862:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
-                    // InternalMenuDsl.g:2862:4: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
+                    // InternalMenuDsl.g:2939:3: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalMenuDsl.g:2939:4: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2();
@@ -10419,27 +10725,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_3_1"
-    // InternalMenuDsl.g:2870:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
+    // InternalMenuDsl.g:2947:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2874:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
-            int alt26=2;
-            alt26 = dfa26.predict(input);
-            switch (alt26) {
+            // InternalMenuDsl.g:2951:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
+            int alt27=2;
+            alt27 = dfa27.predict(input);
+            switch (alt27) {
                 case 1 :
-                    // InternalMenuDsl.g:2875:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalMenuDsl.g:2952:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
                     {
-                    // InternalMenuDsl.g:2875:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-                    // InternalMenuDsl.g:2876:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalMenuDsl.g:2952:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalMenuDsl.g:2953:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
                     }
-                    // InternalMenuDsl.g:2877:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-                    // InternalMenuDsl.g:2877:4: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+                    // InternalMenuDsl.g:2954:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalMenuDsl.g:2954:4: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
@@ -10459,16 +10765,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2881:2: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalMenuDsl.g:2958:2: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
                     {
-                    // InternalMenuDsl.g:2881:2: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
-                    // InternalMenuDsl.g:2882:3: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalMenuDsl.g:2958:2: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalMenuDsl.g:2959:3: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1()); 
                     }
-                    // InternalMenuDsl.g:2883:3: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
-                    // InternalMenuDsl.g:2883:4: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
+                    // InternalMenuDsl.g:2960:3: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalMenuDsl.g:2960:4: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3_1_1__0();
@@ -10505,21 +10811,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPrimaryExpression__Alternatives"
-    // InternalMenuDsl.g:2891:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );
+    // InternalMenuDsl.g:2968:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );
     public final void rule__XPrimaryExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2895:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) )
-            int alt27=15;
-            alt27 = dfa27.predict(input);
-            switch (alt27) {
+            // InternalMenuDsl.g:2972:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) )
+            int alt28=15;
+            alt28 = dfa28.predict(input);
+            switch (alt28) {
                 case 1 :
-                    // InternalMenuDsl.g:2896:2: ( ruleXConstructorCall )
+                    // InternalMenuDsl.g:2973:2: ( ruleXConstructorCall )
                     {
-                    // InternalMenuDsl.g:2896:2: ( ruleXConstructorCall )
-                    // InternalMenuDsl.g:2897:3: ruleXConstructorCall
+                    // InternalMenuDsl.g:2973:2: ( ruleXConstructorCall )
+                    // InternalMenuDsl.g:2974:3: ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
@@ -10539,10 +10845,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2902:2: ( ruleXBlockExpression )
+                    // InternalMenuDsl.g:2979:2: ( ruleXBlockExpression )
                     {
-                    // InternalMenuDsl.g:2902:2: ( ruleXBlockExpression )
-                    // InternalMenuDsl.g:2903:3: ruleXBlockExpression
+                    // InternalMenuDsl.g:2979:2: ( ruleXBlockExpression )
+                    // InternalMenuDsl.g:2980:3: ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
@@ -10562,10 +10868,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2908:2: ( ruleXSwitchExpression )
+                    // InternalMenuDsl.g:2985:2: ( ruleXSwitchExpression )
                     {
-                    // InternalMenuDsl.g:2908:2: ( ruleXSwitchExpression )
-                    // InternalMenuDsl.g:2909:3: ruleXSwitchExpression
+                    // InternalMenuDsl.g:2985:2: ( ruleXSwitchExpression )
+                    // InternalMenuDsl.g:2986:3: ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
@@ -10585,16 +10891,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2914:2: ( ( ruleXSynchronizedExpression ) )
+                    // InternalMenuDsl.g:2991:2: ( ( ruleXSynchronizedExpression ) )
                     {
-                    // InternalMenuDsl.g:2914:2: ( ( ruleXSynchronizedExpression ) )
-                    // InternalMenuDsl.g:2915:3: ( ruleXSynchronizedExpression )
+                    // InternalMenuDsl.g:2991:2: ( ( ruleXSynchronizedExpression ) )
+                    // InternalMenuDsl.g:2992:3: ( ruleXSynchronizedExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                     }
-                    // InternalMenuDsl.g:2916:3: ( ruleXSynchronizedExpression )
-                    // InternalMenuDsl.g:2916:4: ruleXSynchronizedExpression
+                    // InternalMenuDsl.g:2993:3: ( ruleXSynchronizedExpression )
+                    // InternalMenuDsl.g:2993:4: ruleXSynchronizedExpression
                     {
                     pushFollow(FOLLOW_2);
                     ruleXSynchronizedExpression();
@@ -10614,10 +10920,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:2920:2: ( ruleXFeatureCall )
+                    // InternalMenuDsl.g:2997:2: ( ruleXFeatureCall )
                     {
-                    // InternalMenuDsl.g:2920:2: ( ruleXFeatureCall )
-                    // InternalMenuDsl.g:2921:3: ruleXFeatureCall
+                    // InternalMenuDsl.g:2997:2: ( ruleXFeatureCall )
+                    // InternalMenuDsl.g:2998:3: ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
@@ -10637,10 +10943,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:2926:2: ( ruleXLiteral )
+                    // InternalMenuDsl.g:3003:2: ( ruleXLiteral )
                     {
-                    // InternalMenuDsl.g:2926:2: ( ruleXLiteral )
-                    // InternalMenuDsl.g:2927:3: ruleXLiteral
+                    // InternalMenuDsl.g:3003:2: ( ruleXLiteral )
+                    // InternalMenuDsl.g:3004:3: ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
@@ -10660,10 +10966,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:2932:2: ( ruleXIfExpression )
+                    // InternalMenuDsl.g:3009:2: ( ruleXIfExpression )
                     {
-                    // InternalMenuDsl.g:2932:2: ( ruleXIfExpression )
-                    // InternalMenuDsl.g:2933:3: ruleXIfExpression
+                    // InternalMenuDsl.g:3009:2: ( ruleXIfExpression )
+                    // InternalMenuDsl.g:3010:3: ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
@@ -10683,16 +10989,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 8 :
-                    // InternalMenuDsl.g:2938:2: ( ( ruleXForLoopExpression ) )
+                    // InternalMenuDsl.g:3015:2: ( ( ruleXForLoopExpression ) )
                     {
-                    // InternalMenuDsl.g:2938:2: ( ( ruleXForLoopExpression ) )
-                    // InternalMenuDsl.g:2939:3: ( ruleXForLoopExpression )
+                    // InternalMenuDsl.g:3015:2: ( ( ruleXForLoopExpression ) )
+                    // InternalMenuDsl.g:3016:3: ( ruleXForLoopExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                     }
-                    // InternalMenuDsl.g:2940:3: ( ruleXForLoopExpression )
-                    // InternalMenuDsl.g:2940:4: ruleXForLoopExpression
+                    // InternalMenuDsl.g:3017:3: ( ruleXForLoopExpression )
+                    // InternalMenuDsl.g:3017:4: ruleXForLoopExpression
                     {
                     pushFollow(FOLLOW_2);
                     ruleXForLoopExpression();
@@ -10712,10 +11018,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 9 :
-                    // InternalMenuDsl.g:2944:2: ( ruleXBasicForLoopExpression )
+                    // InternalMenuDsl.g:3021:2: ( ruleXBasicForLoopExpression )
                     {
-                    // InternalMenuDsl.g:2944:2: ( ruleXBasicForLoopExpression )
-                    // InternalMenuDsl.g:2945:3: ruleXBasicForLoopExpression
+                    // InternalMenuDsl.g:3021:2: ( ruleXBasicForLoopExpression )
+                    // InternalMenuDsl.g:3022:3: ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
@@ -10735,10 +11041,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 10 :
-                    // InternalMenuDsl.g:2950:2: ( ruleXWhileExpression )
+                    // InternalMenuDsl.g:3027:2: ( ruleXWhileExpression )
                     {
-                    // InternalMenuDsl.g:2950:2: ( ruleXWhileExpression )
-                    // InternalMenuDsl.g:2951:3: ruleXWhileExpression
+                    // InternalMenuDsl.g:3027:2: ( ruleXWhileExpression )
+                    // InternalMenuDsl.g:3028:3: ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
@@ -10758,10 +11064,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 11 :
-                    // InternalMenuDsl.g:2956:2: ( ruleXDoWhileExpression )
+                    // InternalMenuDsl.g:3033:2: ( ruleXDoWhileExpression )
                     {
-                    // InternalMenuDsl.g:2956:2: ( ruleXDoWhileExpression )
-                    // InternalMenuDsl.g:2957:3: ruleXDoWhileExpression
+                    // InternalMenuDsl.g:3033:2: ( ruleXDoWhileExpression )
+                    // InternalMenuDsl.g:3034:3: ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
@@ -10781,10 +11087,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 12 :
-                    // InternalMenuDsl.g:2962:2: ( ruleXThrowExpression )
+                    // InternalMenuDsl.g:3039:2: ( ruleXThrowExpression )
                     {
-                    // InternalMenuDsl.g:2962:2: ( ruleXThrowExpression )
-                    // InternalMenuDsl.g:2963:3: ruleXThrowExpression
+                    // InternalMenuDsl.g:3039:2: ( ruleXThrowExpression )
+                    // InternalMenuDsl.g:3040:3: ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
@@ -10804,10 +11110,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 13 :
-                    // InternalMenuDsl.g:2968:2: ( ruleXReturnExpression )
+                    // InternalMenuDsl.g:3045:2: ( ruleXReturnExpression )
                     {
-                    // InternalMenuDsl.g:2968:2: ( ruleXReturnExpression )
-                    // InternalMenuDsl.g:2969:3: ruleXReturnExpression
+                    // InternalMenuDsl.g:3045:2: ( ruleXReturnExpression )
+                    // InternalMenuDsl.g:3046:3: ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
@@ -10827,10 +11133,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 14 :
-                    // InternalMenuDsl.g:2974:2: ( ruleXTryCatchFinallyExpression )
+                    // InternalMenuDsl.g:3051:2: ( ruleXTryCatchFinallyExpression )
                     {
-                    // InternalMenuDsl.g:2974:2: ( ruleXTryCatchFinallyExpression )
-                    // InternalMenuDsl.g:2975:3: ruleXTryCatchFinallyExpression
+                    // InternalMenuDsl.g:3051:2: ( ruleXTryCatchFinallyExpression )
+                    // InternalMenuDsl.g:3052:3: ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
@@ -10850,10 +11156,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 15 :
-                    // InternalMenuDsl.g:2980:2: ( ruleXParenthesizedExpression )
+                    // InternalMenuDsl.g:3057:2: ( ruleXParenthesizedExpression )
                     {
-                    // InternalMenuDsl.g:2980:2: ( ruleXParenthesizedExpression )
-                    // InternalMenuDsl.g:2981:3: ruleXParenthesizedExpression
+                    // InternalMenuDsl.g:3057:2: ( ruleXParenthesizedExpression )
+                    // InternalMenuDsl.g:3058:3: ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
@@ -10890,67 +11196,67 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XLiteral__Alternatives"
-    // InternalMenuDsl.g:2990:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
+    // InternalMenuDsl.g:3067:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
     public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:2994:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
-            int alt28=7;
+            // InternalMenuDsl.g:3071:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
+            int alt29=7;
             switch ( input.LA(1) ) {
-            case 65:
+            case 67:
                 {
-                alt28=1;
+                alt29=1;
                 }
                 break;
-            case 66:
+            case 68:
                 {
-                alt28=2;
+                alt29=2;
                 }
                 break;
             case 50:
-            case 105:
+            case 107:
                 {
-                alt28=3;
+                alt29=3;
                 }
                 break;
             case RULE_HEX:
             case RULE_INT:
             case RULE_DECIMAL:
                 {
-                alt28=4;
+                alt29=4;
                 }
                 break;
-            case 79:
+            case 81:
                 {
-                alt28=5;
+                alt29=5;
                 }
                 break;
             case RULE_STRING:
                 {
-                alt28=6;
+                alt29=6;
                 }
                 break;
-            case 80:
+            case 82:
                 {
-                alt28=7;
+                alt29=7;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 28, 0, input);
+                    new NoViableAltException("", 29, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt28) {
+            switch (alt29) {
                 case 1 :
-                    // InternalMenuDsl.g:2995:2: ( ruleXCollectionLiteral )
+                    // InternalMenuDsl.g:3072:2: ( ruleXCollectionLiteral )
                     {
-                    // InternalMenuDsl.g:2995:2: ( ruleXCollectionLiteral )
-                    // InternalMenuDsl.g:2996:3: ruleXCollectionLiteral
+                    // InternalMenuDsl.g:3072:2: ( ruleXCollectionLiteral )
+                    // InternalMenuDsl.g:3073:3: ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
@@ -10970,16 +11276,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3001:2: ( ( ruleXClosure ) )
+                    // InternalMenuDsl.g:3078:2: ( ( ruleXClosure ) )
                     {
-                    // InternalMenuDsl.g:3001:2: ( ( ruleXClosure ) )
-                    // InternalMenuDsl.g:3002:3: ( ruleXClosure )
+                    // InternalMenuDsl.g:3078:2: ( ( ruleXClosure ) )
+                    // InternalMenuDsl.g:3079:3: ( ruleXClosure )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                     }
-                    // InternalMenuDsl.g:3003:3: ( ruleXClosure )
-                    // InternalMenuDsl.g:3003:4: ruleXClosure
+                    // InternalMenuDsl.g:3080:3: ( ruleXClosure )
+                    // InternalMenuDsl.g:3080:4: ruleXClosure
                     {
                     pushFollow(FOLLOW_2);
                     ruleXClosure();
@@ -10999,10 +11305,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:3007:2: ( ruleXBooleanLiteral )
+                    // InternalMenuDsl.g:3084:2: ( ruleXBooleanLiteral )
                     {
-                    // InternalMenuDsl.g:3007:2: ( ruleXBooleanLiteral )
-                    // InternalMenuDsl.g:3008:3: ruleXBooleanLiteral
+                    // InternalMenuDsl.g:3084:2: ( ruleXBooleanLiteral )
+                    // InternalMenuDsl.g:3085:3: ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
@@ -11022,10 +11328,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:3013:2: ( ruleXNumberLiteral )
+                    // InternalMenuDsl.g:3090:2: ( ruleXNumberLiteral )
                     {
-                    // InternalMenuDsl.g:3013:2: ( ruleXNumberLiteral )
-                    // InternalMenuDsl.g:3014:3: ruleXNumberLiteral
+                    // InternalMenuDsl.g:3090:2: ( ruleXNumberLiteral )
+                    // InternalMenuDsl.g:3091:3: ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
@@ -11045,10 +11351,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:3019:2: ( ruleXNullLiteral )
+                    // InternalMenuDsl.g:3096:2: ( ruleXNullLiteral )
                     {
-                    // InternalMenuDsl.g:3019:2: ( ruleXNullLiteral )
-                    // InternalMenuDsl.g:3020:3: ruleXNullLiteral
+                    // InternalMenuDsl.g:3096:2: ( ruleXNullLiteral )
+                    // InternalMenuDsl.g:3097:3: ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
@@ -11068,10 +11374,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:3025:2: ( ruleXStringLiteral )
+                    // InternalMenuDsl.g:3102:2: ( ruleXStringLiteral )
                     {
-                    // InternalMenuDsl.g:3025:2: ( ruleXStringLiteral )
-                    // InternalMenuDsl.g:3026:3: ruleXStringLiteral
+                    // InternalMenuDsl.g:3102:2: ( ruleXStringLiteral )
+                    // InternalMenuDsl.g:3103:3: ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
@@ -11091,10 +11397,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:3031:2: ( ruleXTypeLiteral )
+                    // InternalMenuDsl.g:3108:2: ( ruleXTypeLiteral )
                     {
-                    // InternalMenuDsl.g:3031:2: ( ruleXTypeLiteral )
-                    // InternalMenuDsl.g:3032:3: ruleXTypeLiteral
+                    // InternalMenuDsl.g:3108:2: ( ruleXTypeLiteral )
+                    // InternalMenuDsl.g:3109:3: ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
@@ -11131,29 +11437,29 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCollectionLiteral__Alternatives"
-    // InternalMenuDsl.g:3041:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
+    // InternalMenuDsl.g:3118:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
     public final void rule__XCollectionLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3045:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // InternalMenuDsl.g:3122:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA29_0==65) ) {
-                int LA29_1 = input.LA(2);
+            if ( (LA30_0==67) ) {
+                int LA30_1 = input.LA(2);
 
-                if ( (LA29_1==52) ) {
-                    alt29=1;
+                if ( (LA30_1==57) ) {
+                    alt30=1;
                 }
-                else if ( (LA29_1==66) ) {
-                    alt29=2;
+                else if ( (LA30_1==68) ) {
+                    alt30=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 29, 1, input);
+                        new NoViableAltException("", 30, 1, input);
 
                     throw nvae;
                 }
@@ -11161,16 +11467,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 29, 0, input);
+                    new NoViableAltException("", 30, 0, input);
 
                 throw nvae;
             }
-            switch (alt29) {
+            switch (alt30) {
                 case 1 :
-                    // InternalMenuDsl.g:3046:2: ( ruleXSetLiteral )
+                    // InternalMenuDsl.g:3123:2: ( ruleXSetLiteral )
                     {
-                    // InternalMenuDsl.g:3046:2: ( ruleXSetLiteral )
-                    // InternalMenuDsl.g:3047:3: ruleXSetLiteral
+                    // InternalMenuDsl.g:3123:2: ( ruleXSetLiteral )
+                    // InternalMenuDsl.g:3124:3: ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
@@ -11190,10 +11496,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3052:2: ( ruleXListLiteral )
+                    // InternalMenuDsl.g:3129:2: ( ruleXListLiteral )
                     {
-                    // InternalMenuDsl.g:3052:2: ( ruleXListLiteral )
-                    // InternalMenuDsl.g:3053:3: ruleXListLiteral
+                    // InternalMenuDsl.g:3129:2: ( ruleXListLiteral )
+                    // InternalMenuDsl.g:3130:3: ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
@@ -11230,27 +11536,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Alternatives_2"
-    // InternalMenuDsl.g:3062:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
+    // InternalMenuDsl.g:3139:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
     public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3066:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
-            int alt30=2;
-            alt30 = dfa30.predict(input);
-            switch (alt30) {
+            // InternalMenuDsl.g:3143:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
+            int alt31=2;
+            alt31 = dfa31.predict(input);
+            switch (alt31) {
                 case 1 :
-                    // InternalMenuDsl.g:3067:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:3144:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
                     {
-                    // InternalMenuDsl.g:3067:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-                    // InternalMenuDsl.g:3068:3: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalMenuDsl.g:3144:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:3145:3: ( rule__XSwitchExpression__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
                     }
-                    // InternalMenuDsl.g:3069:3: ( rule__XSwitchExpression__Group_2_0__0 )
-                    // InternalMenuDsl.g:3069:4: rule__XSwitchExpression__Group_2_0__0
+                    // InternalMenuDsl.g:3146:3: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalMenuDsl.g:3146:4: rule__XSwitchExpression__Group_2_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_0__0();
@@ -11270,16 +11576,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3073:2: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalMenuDsl.g:3150:2: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
                     {
-                    // InternalMenuDsl.g:3073:2: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
-                    // InternalMenuDsl.g:3074:3: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalMenuDsl.g:3150:2: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalMenuDsl.g:3151:3: ( rule__XSwitchExpression__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1()); 
                     }
-                    // InternalMenuDsl.g:3075:3: ( rule__XSwitchExpression__Group_2_1__0 )
-                    // InternalMenuDsl.g:3075:4: rule__XSwitchExpression__Group_2_1__0
+                    // InternalMenuDsl.g:3152:3: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalMenuDsl.g:3152:4: rule__XSwitchExpression__Group_2_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1__0();
@@ -11316,41 +11622,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Alternatives_3"
-    // InternalMenuDsl.g:3083:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
+    // InternalMenuDsl.g:3160:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
     public final void rule__XCasePart__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3087:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // InternalMenuDsl.g:3164:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( (LA31_0==72) ) {
-                alt31=1;
+            if ( (LA32_0==74) ) {
+                alt32=1;
             }
-            else if ( (LA31_0==63) ) {
-                alt31=2;
+            else if ( (LA32_0==65) ) {
+                alt32=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 31, 0, input);
+                    new NoViableAltException("", 32, 0, input);
 
                 throw nvae;
             }
-            switch (alt31) {
+            switch (alt32) {
                 case 1 :
-                    // InternalMenuDsl.g:3088:2: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalMenuDsl.g:3165:2: ( ( rule__XCasePart__Group_3_0__0 ) )
                     {
-                    // InternalMenuDsl.g:3088:2: ( ( rule__XCasePart__Group_3_0__0 ) )
-                    // InternalMenuDsl.g:3089:3: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalMenuDsl.g:3165:2: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalMenuDsl.g:3166:3: ( rule__XCasePart__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getGroup_3_0()); 
                     }
-                    // InternalMenuDsl.g:3090:3: ( rule__XCasePart__Group_3_0__0 )
-                    // InternalMenuDsl.g:3090:4: rule__XCasePart__Group_3_0__0
+                    // InternalMenuDsl.g:3167:3: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalMenuDsl.g:3167:4: rule__XCasePart__Group_3_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_3_0__0();
@@ -11370,16 +11676,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3094:2: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalMenuDsl.g:3171:2: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
                     {
-                    // InternalMenuDsl.g:3094:2: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
-                    // InternalMenuDsl.g:3095:3: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalMenuDsl.g:3171:2: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalMenuDsl.g:3172:3: ( rule__XCasePart__FallThroughAssignment_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getFallThroughAssignment_3_1()); 
                     }
-                    // InternalMenuDsl.g:3096:3: ( rule__XCasePart__FallThroughAssignment_3_1 )
-                    // InternalMenuDsl.g:3096:4: rule__XCasePart__FallThroughAssignment_3_1
+                    // InternalMenuDsl.g:3173:3: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalMenuDsl.g:3173:4: rule__XCasePart__FallThroughAssignment_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XCasePart__FallThroughAssignment_3_1();
@@ -11416,35 +11722,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionOrVarDeclaration__Alternatives"
-    // InternalMenuDsl.g:3104:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
+    // InternalMenuDsl.g:3181:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
     public final void rule__XExpressionOrVarDeclaration__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3108:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // InternalMenuDsl.g:3185:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA32_0==44||LA32_0==104) ) {
-                alt32=1;
+            if ( (LA33_0==44||LA33_0==106) ) {
+                alt33=1;
             }
-            else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_DECIMAL)||LA32_0==27||(LA32_0>=34 && LA32_0<=35)||LA32_0==40||(LA32_0>=45 && LA32_0<=50)||LA32_0==52||LA32_0==61||(LA32_0>=65 && LA32_0<=66)||LA32_0==69||LA32_0==71||(LA32_0>=75 && LA32_0<=83)||LA32_0==85||LA32_0==105) ) {
-                alt32=2;
+            else if ( ((LA33_0>=RULE_STRING && LA33_0<=RULE_DECIMAL)||LA33_0==27||(LA33_0>=34 && LA33_0<=35)||LA33_0==40||(LA33_0>=45 && LA33_0<=50)||LA33_0==57||LA33_0==63||(LA33_0>=67 && LA33_0<=68)||LA33_0==71||LA33_0==73||(LA33_0>=77 && LA33_0<=85)||LA33_0==87||LA33_0==107) ) {
+                alt33=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 32, 0, input);
+                    new NoViableAltException("", 33, 0, input);
 
                 throw nvae;
             }
-            switch (alt32) {
+            switch (alt33) {
                 case 1 :
-                    // InternalMenuDsl.g:3109:2: ( ruleXVariableDeclaration )
+                    // InternalMenuDsl.g:3186:2: ( ruleXVariableDeclaration )
                     {
-                    // InternalMenuDsl.g:3109:2: ( ruleXVariableDeclaration )
-                    // InternalMenuDsl.g:3110:3: ruleXVariableDeclaration
+                    // InternalMenuDsl.g:3186:2: ( ruleXVariableDeclaration )
+                    // InternalMenuDsl.g:3187:3: ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
@@ -11464,10 +11770,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3115:2: ( ruleXExpression )
+                    // InternalMenuDsl.g:3192:2: ( ruleXExpression )
                     {
-                    // InternalMenuDsl.g:3115:2: ( ruleXExpression )
-                    // InternalMenuDsl.g:3116:3: ruleXExpression
+                    // InternalMenuDsl.g:3192:2: ( ruleXExpression )
+                    // InternalMenuDsl.g:3193:3: ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
@@ -11504,41 +11810,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_1"
-    // InternalMenuDsl.g:3125:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
+    // InternalMenuDsl.g:3202:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
     public final void rule__XVariableDeclaration__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3129:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            // InternalMenuDsl.g:3206:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( (LA33_0==104) ) {
-                alt33=1;
+            if ( (LA34_0==106) ) {
+                alt34=1;
             }
-            else if ( (LA33_0==44) ) {
-                alt33=2;
+            else if ( (LA34_0==44) ) {
+                alt34=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 33, 0, input);
+                    new NoViableAltException("", 34, 0, input);
 
                 throw nvae;
             }
-            switch (alt33) {
+            switch (alt34) {
                 case 1 :
-                    // InternalMenuDsl.g:3130:2: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalMenuDsl.g:3207:2: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
                     {
-                    // InternalMenuDsl.g:3130:2: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
-                    // InternalMenuDsl.g:3131:3: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalMenuDsl.g:3207:2: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalMenuDsl.g:3208:3: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getWriteableAssignment_1_0()); 
                     }
-                    // InternalMenuDsl.g:3132:3: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
-                    // InternalMenuDsl.g:3132:4: rule__XVariableDeclaration__WriteableAssignment_1_0
+                    // InternalMenuDsl.g:3209:3: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalMenuDsl.g:3209:4: rule__XVariableDeclaration__WriteableAssignment_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__WriteableAssignment_1_0();
@@ -11558,10 +11864,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3136:2: ( 'val' )
+                    // InternalMenuDsl.g:3213:2: ( 'val' )
                     {
-                    // InternalMenuDsl.g:3136:2: ( 'val' )
-                    // InternalMenuDsl.g:3137:3: 'val'
+                    // InternalMenuDsl.g:3213:2: ( 'val' )
+                    // InternalMenuDsl.g:3214:3: 'val'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); 
@@ -11594,55 +11900,55 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_2"
-    // InternalMenuDsl.g:3146:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
+    // InternalMenuDsl.g:3223:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
     public final void rule__XVariableDeclaration__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3150:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            // InternalMenuDsl.g:3227:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
+            int alt35=2;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA34_0==RULE_ID) ) {
-                int LA34_1 = input.LA(2);
+            if ( (LA35_0==RULE_ID) ) {
+                int LA35_1 = input.LA(2);
 
-                if ( (synpred79_InternalMenuDsl()) ) {
-                    alt34=1;
+                if ( (synpred81_InternalMenuDsl()) ) {
+                    alt35=1;
                 }
                 else if ( (true) ) {
-                    alt34=2;
+                    alt35=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 34, 1, input);
+                        new NoViableAltException("", 35, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA34_0==31||LA34_0==61) ) {
-                alt34=1;
+            else if ( (LA35_0==31||LA35_0==63) ) {
+                alt35=1;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 34, 0, input);
+                    new NoViableAltException("", 35, 0, input);
 
                 throw nvae;
             }
-            switch (alt34) {
+            switch (alt35) {
                 case 1 :
-                    // InternalMenuDsl.g:3151:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:3228:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
                     {
-                    // InternalMenuDsl.g:3151:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-                    // InternalMenuDsl.g:3152:3: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalMenuDsl.g:3228:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:3229:3: ( rule__XVariableDeclaration__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
                     }
-                    // InternalMenuDsl.g:3153:3: ( rule__XVariableDeclaration__Group_2_0__0 )
-                    // InternalMenuDsl.g:3153:4: rule__XVariableDeclaration__Group_2_0__0
+                    // InternalMenuDsl.g:3230:3: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalMenuDsl.g:3230:4: rule__XVariableDeclaration__Group_2_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_2_0__0();
@@ -11662,16 +11968,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3157:2: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalMenuDsl.g:3234:2: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
                     {
-                    // InternalMenuDsl.g:3157:2: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
-                    // InternalMenuDsl.g:3158:3: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalMenuDsl.g:3234:2: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalMenuDsl.g:3235:3: ( rule__XVariableDeclaration__NameAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_1()); 
                     }
-                    // InternalMenuDsl.g:3159:3: ( rule__XVariableDeclaration__NameAssignment_2_1 )
-                    // InternalMenuDsl.g:3159:4: rule__XVariableDeclaration__NameAssignment_2_1
+                    // InternalMenuDsl.g:3236:3: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalMenuDsl.g:3236:4: rule__XVariableDeclaration__NameAssignment_2_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__NameAssignment_2_1();
@@ -11708,27 +12014,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Alternatives_3_1"
-    // InternalMenuDsl.g:3167:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
+    // InternalMenuDsl.g:3244:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
     public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3171:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
-            int alt35=2;
-            alt35 = dfa35.predict(input);
-            switch (alt35) {
+            // InternalMenuDsl.g:3248:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
+            int alt36=2;
+            alt36 = dfa36.predict(input);
+            switch (alt36) {
                 case 1 :
-                    // InternalMenuDsl.g:3172:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalMenuDsl.g:3249:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
                     {
-                    // InternalMenuDsl.g:3172:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-                    // InternalMenuDsl.g:3173:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalMenuDsl.g:3249:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalMenuDsl.g:3250:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
                     }
-                    // InternalMenuDsl.g:3174:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-                    // InternalMenuDsl.g:3174:4: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+                    // InternalMenuDsl.g:3251:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalMenuDsl.g:3251:4: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
@@ -11748,16 +12054,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3178:2: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalMenuDsl.g:3255:2: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
                     {
-                    // InternalMenuDsl.g:3178:2: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
-                    // InternalMenuDsl.g:3179:3: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalMenuDsl.g:3255:2: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalMenuDsl.g:3256:3: ( rule__XFeatureCall__Group_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1()); 
                     }
-                    // InternalMenuDsl.g:3180:3: ( rule__XFeatureCall__Group_3_1_1__0 )
-                    // InternalMenuDsl.g:3180:4: rule__XFeatureCall__Group_3_1_1__0
+                    // InternalMenuDsl.g:3257:3: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalMenuDsl.g:3257:4: rule__XFeatureCall__Group_3_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3_1_1__0();
@@ -11794,54 +12100,54 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FeatureCallID__Alternatives"
-    // InternalMenuDsl.g:3188:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) );
+    // InternalMenuDsl.g:3265:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) );
     public final void rule__FeatureCallID__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3192:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) )
-            int alt36=5;
+            // InternalMenuDsl.g:3269:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) )
+            int alt37=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                alt36=1;
+                alt37=1;
                 }
                 break;
             case 45:
                 {
-                alt36=2;
+                alt37=2;
                 }
                 break;
             case 46:
                 {
-                alt36=3;
+                alt37=3;
                 }
                 break;
             case 47:
                 {
-                alt36=4;
+                alt37=4;
                 }
                 break;
             case 48:
                 {
-                alt36=5;
+                alt37=5;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 36, 0, input);
+                    new NoViableAltException("", 37, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt36) {
+            switch (alt37) {
                 case 1 :
-                    // InternalMenuDsl.g:3193:2: ( ruleValidID )
+                    // InternalMenuDsl.g:3270:2: ( ruleValidID )
                     {
-                    // InternalMenuDsl.g:3193:2: ( ruleValidID )
-                    // InternalMenuDsl.g:3194:3: ruleValidID
+                    // InternalMenuDsl.g:3270:2: ( ruleValidID )
+                    // InternalMenuDsl.g:3271:3: ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
@@ -11861,10 +12167,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3199:2: ( 'extends' )
+                    // InternalMenuDsl.g:3276:2: ( 'extends' )
                     {
-                    // InternalMenuDsl.g:3199:2: ( 'extends' )
-                    // InternalMenuDsl.g:3200:3: 'extends'
+                    // InternalMenuDsl.g:3276:2: ( 'extends' )
+                    // InternalMenuDsl.g:3277:3: 'extends'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtendsKeyword_1()); 
@@ -11880,10 +12186,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:3205:2: ( 'static' )
+                    // InternalMenuDsl.g:3282:2: ( 'static' )
                     {
-                    // InternalMenuDsl.g:3205:2: ( 'static' )
-                    // InternalMenuDsl.g:3206:3: 'static'
+                    // InternalMenuDsl.g:3282:2: ( 'static' )
+                    // InternalMenuDsl.g:3283:3: 'static'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getStaticKeyword_2()); 
@@ -11899,10 +12205,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:3211:2: ( 'import' )
+                    // InternalMenuDsl.g:3288:2: ( 'import' )
                     {
-                    // InternalMenuDsl.g:3211:2: ( 'import' )
-                    // InternalMenuDsl.g:3212:3: 'import'
+                    // InternalMenuDsl.g:3288:2: ( 'import' )
+                    // InternalMenuDsl.g:3289:3: 'import'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getImportKeyword_3()); 
@@ -11918,10 +12224,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:3217:2: ( 'extension' )
+                    // InternalMenuDsl.g:3294:2: ( 'extension' )
                     {
-                    // InternalMenuDsl.g:3217:2: ( 'extension' )
-                    // InternalMenuDsl.g:3218:3: 'extension'
+                    // InternalMenuDsl.g:3294:2: ( 'extension' )
+                    // InternalMenuDsl.g:3295:3: 'extension'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtensionKeyword_4()); 
@@ -11954,35 +12260,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__IdOrSuper__Alternatives"
-    // InternalMenuDsl.g:3227:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
+    // InternalMenuDsl.g:3304:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
     public final void rule__IdOrSuper__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3231:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // InternalMenuDsl.g:3308:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA37_0==RULE_ID||(LA37_0>=45 && LA37_0<=48)) ) {
-                alt37=1;
+            if ( (LA38_0==RULE_ID||(LA38_0>=45 && LA38_0<=48)) ) {
+                alt38=1;
             }
-            else if ( (LA37_0==49) ) {
-                alt37=2;
+            else if ( (LA38_0==49) ) {
+                alt38=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 37, 0, input);
+                    new NoViableAltException("", 38, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt38) {
                 case 1 :
-                    // InternalMenuDsl.g:3232:2: ( ruleFeatureCallID )
+                    // InternalMenuDsl.g:3309:2: ( ruleFeatureCallID )
                     {
-                    // InternalMenuDsl.g:3232:2: ( ruleFeatureCallID )
-                    // InternalMenuDsl.g:3233:3: ruleFeatureCallID
+                    // InternalMenuDsl.g:3309:2: ( ruleFeatureCallID )
+                    // InternalMenuDsl.g:3310:3: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
@@ -12002,10 +12308,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3238:2: ( 'super' )
+                    // InternalMenuDsl.g:3315:2: ( 'super' )
                     {
-                    // InternalMenuDsl.g:3238:2: ( 'super' )
-                    // InternalMenuDsl.g:3239:3: 'super'
+                    // InternalMenuDsl.g:3315:2: ( 'super' )
+                    // InternalMenuDsl.g:3316:3: 'super'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getSuperKeyword_1()); 
@@ -12038,27 +12344,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Alternatives_4_1"
-    // InternalMenuDsl.g:3248:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
+    // InternalMenuDsl.g:3325:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
     public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3252:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
-            int alt38=2;
-            alt38 = dfa38.predict(input);
-            switch (alt38) {
+            // InternalMenuDsl.g:3329:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
+            int alt39=2;
+            alt39 = dfa39.predict(input);
+            switch (alt39) {
                 case 1 :
-                    // InternalMenuDsl.g:3253:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalMenuDsl.g:3330:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
                     {
-                    // InternalMenuDsl.g:3253:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-                    // InternalMenuDsl.g:3254:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalMenuDsl.g:3330:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalMenuDsl.g:3331:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
                     }
-                    // InternalMenuDsl.g:3255:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-                    // InternalMenuDsl.g:3255:4: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+                    // InternalMenuDsl.g:3332:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalMenuDsl.g:3332:4: rule__XConstructorCall__ArgumentsAssignment_4_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_4_1_0();
@@ -12078,16 +12384,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3259:2: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalMenuDsl.g:3336:2: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
                     {
-                    // InternalMenuDsl.g:3259:2: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
-                    // InternalMenuDsl.g:3260:3: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalMenuDsl.g:3336:2: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalMenuDsl.g:3337:3: ( rule__XConstructorCall__Group_4_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1()); 
                     }
-                    // InternalMenuDsl.g:3261:3: ( rule__XConstructorCall__Group_4_1_1__0 )
-                    // InternalMenuDsl.g:3261:4: rule__XConstructorCall__Group_4_1_1__0
+                    // InternalMenuDsl.g:3338:3: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalMenuDsl.g:3338:4: rule__XConstructorCall__Group_4_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4_1_1__0();
@@ -12124,35 +12430,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBooleanLiteral__Alternatives_1"
-    // InternalMenuDsl.g:3269:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalMenuDsl.g:3346:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__XBooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3273:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // InternalMenuDsl.g:3350:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA39_0==50) ) {
-                alt39=1;
+            if ( (LA40_0==50) ) {
+                alt40=1;
             }
-            else if ( (LA39_0==105) ) {
-                alt39=2;
+            else if ( (LA40_0==107) ) {
+                alt40=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 39, 0, input);
+                    new NoViableAltException("", 40, 0, input);
 
                 throw nvae;
             }
-            switch (alt39) {
+            switch (alt40) {
                 case 1 :
-                    // InternalMenuDsl.g:3274:2: ( 'false' )
+                    // InternalMenuDsl.g:3351:2: ( 'false' )
                     {
-                    // InternalMenuDsl.g:3274:2: ( 'false' )
-                    // InternalMenuDsl.g:3275:3: 'false'
+                    // InternalMenuDsl.g:3351:2: ( 'false' )
+                    // InternalMenuDsl.g:3352:3: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); 
@@ -12168,16 +12474,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3280:2: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalMenuDsl.g:3357:2: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // InternalMenuDsl.g:3280:2: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // InternalMenuDsl.g:3281:3: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalMenuDsl.g:3357:2: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalMenuDsl.g:3358:3: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
                     }
-                    // InternalMenuDsl.g:3282:3: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
-                    // InternalMenuDsl.g:3282:4: rule__XBooleanLiteral__IsTrueAssignment_1_1
+                    // InternalMenuDsl.g:3359:3: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalMenuDsl.g:3359:4: rule__XBooleanLiteral__IsTrueAssignment_1_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XBooleanLiteral__IsTrueAssignment_1_1();
@@ -12214,41 +12520,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Alternatives_3"
-    // InternalMenuDsl.g:3290:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
+    // InternalMenuDsl.g:3367:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
     public final void rule__XTryCatchFinallyExpression__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3294:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            // InternalMenuDsl.g:3371:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
+            int alt41=2;
+            int LA41_0 = input.LA(1);
 
-            if ( (LA40_0==86) ) {
-                alt40=1;
+            if ( (LA41_0==88) ) {
+                alt41=1;
             }
-            else if ( (LA40_0==84) ) {
-                alt40=2;
+            else if ( (LA41_0==86) ) {
+                alt41=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 40, 0, input);
+                    new NoViableAltException("", 41, 0, input);
 
                 throw nvae;
             }
-            switch (alt40) {
+            switch (alt41) {
                 case 1 :
-                    // InternalMenuDsl.g:3295:2: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalMenuDsl.g:3372:2: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
                     {
-                    // InternalMenuDsl.g:3295:2: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
-                    // InternalMenuDsl.g:3296:3: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalMenuDsl.g:3372:2: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalMenuDsl.g:3373:3: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0()); 
                     }
-                    // InternalMenuDsl.g:3297:3: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
-                    // InternalMenuDsl.g:3297:4: rule__XTryCatchFinallyExpression__Group_3_0__0
+                    // InternalMenuDsl.g:3374:3: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalMenuDsl.g:3374:4: rule__XTryCatchFinallyExpression__Group_3_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0__0();
@@ -12268,16 +12574,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3301:2: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalMenuDsl.g:3378:2: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
                     {
-                    // InternalMenuDsl.g:3301:2: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
-                    // InternalMenuDsl.g:3302:3: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalMenuDsl.g:3378:2: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalMenuDsl.g:3379:3: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_1()); 
                     }
-                    // InternalMenuDsl.g:3303:3: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
-                    // InternalMenuDsl.g:3303:4: rule__XTryCatchFinallyExpression__Group_3_1__0
+                    // InternalMenuDsl.g:3380:3: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalMenuDsl.g:3380:4: rule__XTryCatchFinallyExpression__Group_3_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_1__0();
@@ -12314,35 +12620,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Alternatives"
-    // InternalMenuDsl.g:3311:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
+    // InternalMenuDsl.g:3388:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
     public final void rule__Number__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3315:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
-            int alt41=2;
-            int LA41_0 = input.LA(1);
+            // InternalMenuDsl.g:3392:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
+            int alt42=2;
+            int LA42_0 = input.LA(1);
 
-            if ( (LA41_0==RULE_HEX) ) {
-                alt41=1;
+            if ( (LA42_0==RULE_HEX) ) {
+                alt42=1;
             }
-            else if ( ((LA41_0>=RULE_INT && LA41_0<=RULE_DECIMAL)) ) {
-                alt41=2;
+            else if ( ((LA42_0>=RULE_INT && LA42_0<=RULE_DECIMAL)) ) {
+                alt42=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 41, 0, input);
+                    new NoViableAltException("", 42, 0, input);
 
                 throw nvae;
             }
-            switch (alt41) {
+            switch (alt42) {
                 case 1 :
-                    // InternalMenuDsl.g:3316:2: ( RULE_HEX )
+                    // InternalMenuDsl.g:3393:2: ( RULE_HEX )
                     {
-                    // InternalMenuDsl.g:3316:2: ( RULE_HEX )
-                    // InternalMenuDsl.g:3317:3: RULE_HEX
+                    // InternalMenuDsl.g:3393:2: ( RULE_HEX )
+                    // InternalMenuDsl.g:3394:3: RULE_HEX
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getHEXTerminalRuleCall_0()); 
@@ -12358,16 +12664,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3322:2: ( ( rule__Number__Group_1__0 ) )
+                    // InternalMenuDsl.g:3399:2: ( ( rule__Number__Group_1__0 ) )
                     {
-                    // InternalMenuDsl.g:3322:2: ( ( rule__Number__Group_1__0 ) )
-                    // InternalMenuDsl.g:3323:3: ( rule__Number__Group_1__0 )
+                    // InternalMenuDsl.g:3399:2: ( ( rule__Number__Group_1__0 ) )
+                    // InternalMenuDsl.g:3400:3: ( rule__Number__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getGroup_1()); 
                     }
-                    // InternalMenuDsl.g:3324:3: ( rule__Number__Group_1__0 )
-                    // InternalMenuDsl.g:3324:4: rule__Number__Group_1__0
+                    // InternalMenuDsl.g:3401:3: ( rule__Number__Group_1__0 )
+                    // InternalMenuDsl.g:3401:4: rule__Number__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Number__Group_1__0();
@@ -12404,35 +12710,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_0"
-    // InternalMenuDsl.g:3332:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalMenuDsl.g:3409:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3336:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
-            int alt42=2;
-            int LA42_0 = input.LA(1);
+            // InternalMenuDsl.g:3413:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            int alt43=2;
+            int LA43_0 = input.LA(1);
 
-            if ( (LA42_0==RULE_INT) ) {
-                alt42=1;
+            if ( (LA43_0==RULE_INT) ) {
+                alt43=1;
             }
-            else if ( (LA42_0==RULE_DECIMAL) ) {
-                alt42=2;
+            else if ( (LA43_0==RULE_DECIMAL) ) {
+                alt43=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 42, 0, input);
+                    new NoViableAltException("", 43, 0, input);
 
                 throw nvae;
             }
-            switch (alt42) {
+            switch (alt43) {
                 case 1 :
-                    // InternalMenuDsl.g:3337:2: ( RULE_INT )
+                    // InternalMenuDsl.g:3414:2: ( RULE_INT )
                     {
-                    // InternalMenuDsl.g:3337:2: ( RULE_INT )
-                    // InternalMenuDsl.g:3338:3: RULE_INT
+                    // InternalMenuDsl.g:3414:2: ( RULE_INT )
+                    // InternalMenuDsl.g:3415:3: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_0_0()); 
@@ -12448,10 +12754,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3343:2: ( RULE_DECIMAL )
+                    // InternalMenuDsl.g:3420:2: ( RULE_DECIMAL )
                     {
-                    // InternalMenuDsl.g:3343:2: ( RULE_DECIMAL )
-                    // InternalMenuDsl.g:3344:3: RULE_DECIMAL
+                    // InternalMenuDsl.g:3420:2: ( RULE_DECIMAL )
+                    // InternalMenuDsl.g:3421:3: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_0_1()); 
@@ -12484,35 +12790,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_1_1"
-    // InternalMenuDsl.g:3353:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalMenuDsl.g:3430:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3357:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
-            int alt43=2;
-            int LA43_0 = input.LA(1);
+            // InternalMenuDsl.g:3434:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            int alt44=2;
+            int LA44_0 = input.LA(1);
 
-            if ( (LA43_0==RULE_INT) ) {
-                alt43=1;
+            if ( (LA44_0==RULE_INT) ) {
+                alt44=1;
             }
-            else if ( (LA43_0==RULE_DECIMAL) ) {
-                alt43=2;
+            else if ( (LA44_0==RULE_DECIMAL) ) {
+                alt44=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 43, 0, input);
+                    new NoViableAltException("", 44, 0, input);
 
                 throw nvae;
             }
-            switch (alt43) {
+            switch (alt44) {
                 case 1 :
-                    // InternalMenuDsl.g:3358:2: ( RULE_INT )
+                    // InternalMenuDsl.g:3435:2: ( RULE_INT )
                     {
-                    // InternalMenuDsl.g:3358:2: ( RULE_INT )
-                    // InternalMenuDsl.g:3359:3: RULE_INT
+                    // InternalMenuDsl.g:3435:2: ( RULE_INT )
+                    // InternalMenuDsl.g:3436:3: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_1_1_0()); 
@@ -12528,10 +12834,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3364:2: ( RULE_DECIMAL )
+                    // InternalMenuDsl.g:3441:2: ( RULE_DECIMAL )
                     {
-                    // InternalMenuDsl.g:3364:2: ( RULE_DECIMAL )
-                    // InternalMenuDsl.g:3365:3: RULE_DECIMAL
+                    // InternalMenuDsl.g:3441:2: ( RULE_DECIMAL )
+                    // InternalMenuDsl.g:3442:3: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_1_1_1()); 
@@ -12564,41 +12870,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Alternatives"
-    // InternalMenuDsl.g:3374:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
+    // InternalMenuDsl.g:3451:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
     public final void rule__JvmTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3378:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
-            int alt44=2;
-            int LA44_0 = input.LA(1);
+            // InternalMenuDsl.g:3455:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
+            int alt45=2;
+            int LA45_0 = input.LA(1);
 
-            if ( (LA44_0==RULE_ID) ) {
-                alt44=1;
+            if ( (LA45_0==RULE_ID) ) {
+                alt45=1;
             }
-            else if ( (LA44_0==31||LA44_0==61) ) {
-                alt44=2;
+            else if ( (LA45_0==31||LA45_0==63) ) {
+                alt45=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 44, 0, input);
+                    new NoViableAltException("", 45, 0, input);
 
                 throw nvae;
             }
-            switch (alt44) {
+            switch (alt45) {
                 case 1 :
-                    // InternalMenuDsl.g:3379:2: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalMenuDsl.g:3456:2: ( ( rule__JvmTypeReference__Group_0__0 ) )
                     {
-                    // InternalMenuDsl.g:3379:2: ( ( rule__JvmTypeReference__Group_0__0 ) )
-                    // InternalMenuDsl.g:3380:3: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalMenuDsl.g:3456:2: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalMenuDsl.g:3457:3: ( rule__JvmTypeReference__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0()); 
                     }
-                    // InternalMenuDsl.g:3381:3: ( rule__JvmTypeReference__Group_0__0 )
-                    // InternalMenuDsl.g:3381:4: rule__JvmTypeReference__Group_0__0
+                    // InternalMenuDsl.g:3458:3: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalMenuDsl.g:3458:4: rule__JvmTypeReference__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmTypeReference__Group_0__0();
@@ -12618,10 +12924,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3385:2: ( ruleXFunctionTypeRef )
+                    // InternalMenuDsl.g:3462:2: ( ruleXFunctionTypeRef )
                     {
-                    // InternalMenuDsl.g:3385:2: ( ruleXFunctionTypeRef )
-                    // InternalMenuDsl.g:3386:3: ruleXFunctionTypeRef
+                    // InternalMenuDsl.g:3462:2: ( ruleXFunctionTypeRef )
+                    // InternalMenuDsl.g:3463:3: ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
@@ -12658,35 +12964,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmArgumentTypeReference__Alternatives"
-    // InternalMenuDsl.g:3395:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
+    // InternalMenuDsl.g:3472:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
     public final void rule__JvmArgumentTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3399:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
-            int alt45=2;
-            int LA45_0 = input.LA(1);
+            // InternalMenuDsl.g:3476:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
+            int alt46=2;
+            int LA46_0 = input.LA(1);
 
-            if ( (LA45_0==RULE_ID||LA45_0==31||LA45_0==61) ) {
-                alt45=1;
+            if ( (LA46_0==RULE_ID||LA46_0==31||LA46_0==63) ) {
+                alt46=1;
             }
-            else if ( (LA45_0==87) ) {
-                alt45=2;
+            else if ( (LA46_0==89) ) {
+                alt46=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 45, 0, input);
+                    new NoViableAltException("", 46, 0, input);
 
                 throw nvae;
             }
-            switch (alt45) {
+            switch (alt46) {
                 case 1 :
-                    // InternalMenuDsl.g:3400:2: ( ruleJvmTypeReference )
+                    // InternalMenuDsl.g:3477:2: ( ruleJvmTypeReference )
                     {
-                    // InternalMenuDsl.g:3400:2: ( ruleJvmTypeReference )
-                    // InternalMenuDsl.g:3401:3: ruleJvmTypeReference
+                    // InternalMenuDsl.g:3477:2: ( ruleJvmTypeReference )
+                    // InternalMenuDsl.g:3478:3: ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
@@ -12706,10 +13012,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3406:2: ( ruleJvmWildcardTypeReference )
+                    // InternalMenuDsl.g:3483:2: ( ruleJvmWildcardTypeReference )
                     {
-                    // InternalMenuDsl.g:3406:2: ( ruleJvmWildcardTypeReference )
-                    // InternalMenuDsl.g:3407:3: ruleJvmWildcardTypeReference
+                    // InternalMenuDsl.g:3483:2: ( ruleJvmWildcardTypeReference )
+                    // InternalMenuDsl.g:3484:3: ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
@@ -12746,41 +13052,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Alternatives_2"
-    // InternalMenuDsl.g:3416:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
+    // InternalMenuDsl.g:3493:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
     public final void rule__JvmWildcardTypeReference__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3420:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
-            int alt46=2;
-            int LA46_0 = input.LA(1);
+            // InternalMenuDsl.g:3497:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
+            int alt47=2;
+            int LA47_0 = input.LA(1);
 
-            if ( (LA46_0==45) ) {
-                alt46=1;
+            if ( (LA47_0==45) ) {
+                alt47=1;
             }
-            else if ( (LA46_0==49) ) {
-                alt46=2;
+            else if ( (LA47_0==49) ) {
+                alt47=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 46, 0, input);
+                    new NoViableAltException("", 47, 0, input);
 
                 throw nvae;
             }
-            switch (alt46) {
+            switch (alt47) {
                 case 1 :
-                    // InternalMenuDsl.g:3421:2: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:3498:2: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
                     {
-                    // InternalMenuDsl.g:3421:2: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
-                    // InternalMenuDsl.g:3422:3: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalMenuDsl.g:3498:2: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalMenuDsl.g:3499:3: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_0()); 
                     }
-                    // InternalMenuDsl.g:3423:3: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
-                    // InternalMenuDsl.g:3423:4: rule__JvmWildcardTypeReference__Group_2_0__0
+                    // InternalMenuDsl.g:3500:3: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalMenuDsl.g:3500:4: rule__JvmWildcardTypeReference__Group_2_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_0__0();
@@ -12800,16 +13106,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3427:2: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalMenuDsl.g:3504:2: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
                     {
-                    // InternalMenuDsl.g:3427:2: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
-                    // InternalMenuDsl.g:3428:3: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalMenuDsl.g:3504:2: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalMenuDsl.g:3505:3: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_1()); 
                     }
-                    // InternalMenuDsl.g:3429:3: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
-                    // InternalMenuDsl.g:3429:4: rule__JvmWildcardTypeReference__Group_2_1__0
+                    // InternalMenuDsl.g:3506:3: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalMenuDsl.g:3506:4: rule__JvmWildcardTypeReference__Group_2_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_1__0();
@@ -12846,14 +13152,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuModel__Group__0"
-    // InternalMenuDsl.g:3437:1: rule__MenuModel__Group__0 : rule__MenuModel__Group__0__Impl rule__MenuModel__Group__1 ;
+    // InternalMenuDsl.g:3514:1: rule__MenuModel__Group__0 : rule__MenuModel__Group__0__Impl rule__MenuModel__Group__1 ;
     public final void rule__MenuModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3441:1: ( rule__MenuModel__Group__0__Impl rule__MenuModel__Group__1 )
-            // InternalMenuDsl.g:3442:2: rule__MenuModel__Group__0__Impl rule__MenuModel__Group__1
+            // InternalMenuDsl.g:3518:1: ( rule__MenuModel__Group__0__Impl rule__MenuModel__Group__1 )
+            // InternalMenuDsl.g:3519:2: rule__MenuModel__Group__0__Impl rule__MenuModel__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__MenuModel__Group__0__Impl();
@@ -12884,31 +13190,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuModel__Group__0__Impl"
-    // InternalMenuDsl.g:3449:1: rule__MenuModel__Group__0__Impl : ( ( rule__MenuModel__ImportSectionAssignment_0 )? ) ;
+    // InternalMenuDsl.g:3526:1: rule__MenuModel__Group__0__Impl : ( ( rule__MenuModel__ImportSectionAssignment_0 )? ) ;
     public final void rule__MenuModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3453:1: ( ( ( rule__MenuModel__ImportSectionAssignment_0 )? ) )
-            // InternalMenuDsl.g:3454:1: ( ( rule__MenuModel__ImportSectionAssignment_0 )? )
+            // InternalMenuDsl.g:3530:1: ( ( ( rule__MenuModel__ImportSectionAssignment_0 )? ) )
+            // InternalMenuDsl.g:3531:1: ( ( rule__MenuModel__ImportSectionAssignment_0 )? )
             {
-            // InternalMenuDsl.g:3454:1: ( ( rule__MenuModel__ImportSectionAssignment_0 )? )
-            // InternalMenuDsl.g:3455:2: ( rule__MenuModel__ImportSectionAssignment_0 )?
+            // InternalMenuDsl.g:3531:1: ( ( rule__MenuModel__ImportSectionAssignment_0 )? )
+            // InternalMenuDsl.g:3532:2: ( rule__MenuModel__ImportSectionAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuModelAccess().getImportSectionAssignment_0()); 
             }
-            // InternalMenuDsl.g:3456:2: ( rule__MenuModel__ImportSectionAssignment_0 )?
-            int alt47=2;
-            int LA47_0 = input.LA(1);
+            // InternalMenuDsl.g:3533:2: ( rule__MenuModel__ImportSectionAssignment_0 )?
+            int alt48=2;
+            int LA48_0 = input.LA(1);
 
-            if ( (LA47_0==47) ) {
-                alt47=1;
+            if ( (LA48_0==47) ) {
+                alt48=1;
             }
-            switch (alt47) {
+            switch (alt48) {
                 case 1 :
-                    // InternalMenuDsl.g:3456:3: rule__MenuModel__ImportSectionAssignment_0
+                    // InternalMenuDsl.g:3533:3: rule__MenuModel__ImportSectionAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__MenuModel__ImportSectionAssignment_0();
@@ -12946,14 +13252,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuModel__Group__1"
-    // InternalMenuDsl.g:3464:1: rule__MenuModel__Group__1 : rule__MenuModel__Group__1__Impl ;
+    // InternalMenuDsl.g:3541:1: rule__MenuModel__Group__1 : rule__MenuModel__Group__1__Impl ;
     public final void rule__MenuModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3468:1: ( rule__MenuModel__Group__1__Impl )
-            // InternalMenuDsl.g:3469:2: rule__MenuModel__Group__1__Impl
+            // InternalMenuDsl.g:3545:1: ( rule__MenuModel__Group__1__Impl )
+            // InternalMenuDsl.g:3546:2: rule__MenuModel__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__MenuModel__Group__1__Impl();
@@ -12979,52 +13285,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuModel__Group__1__Impl"
-    // InternalMenuDsl.g:3475:1: rule__MenuModel__Group__1__Impl : ( ( rule__MenuModel__PackagesAssignment_1 )* ) ;
+    // InternalMenuDsl.g:3552:1: rule__MenuModel__Group__1__Impl : ( ( rule__MenuModel__MenupackageAssignment_1 ) ) ;
     public final void rule__MenuModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3479:1: ( ( ( rule__MenuModel__PackagesAssignment_1 )* ) )
-            // InternalMenuDsl.g:3480:1: ( ( rule__MenuModel__PackagesAssignment_1 )* )
+            // InternalMenuDsl.g:3556:1: ( ( ( rule__MenuModel__MenupackageAssignment_1 ) ) )
+            // InternalMenuDsl.g:3557:1: ( ( rule__MenuModel__MenupackageAssignment_1 ) )
             {
-            // InternalMenuDsl.g:3480:1: ( ( rule__MenuModel__PackagesAssignment_1 )* )
-            // InternalMenuDsl.g:3481:2: ( rule__MenuModel__PackagesAssignment_1 )*
+            // InternalMenuDsl.g:3557:1: ( ( rule__MenuModel__MenupackageAssignment_1 ) )
+            // InternalMenuDsl.g:3558:2: ( rule__MenuModel__MenupackageAssignment_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuModelAccess().getPackagesAssignment_1()); 
+               before(grammarAccess.getMenuModelAccess().getMenupackageAssignment_1()); 
             }
-            // InternalMenuDsl.g:3482:2: ( rule__MenuModel__PackagesAssignment_1 )*
-            loop48:
-            do {
-                int alt48=2;
-                int LA48_0 = input.LA(1);
-
-                if ( (LA48_0==51) ) {
-                    alt48=1;
-                }
-
-
-                switch (alt48) {
-            	case 1 :
-            	    // InternalMenuDsl.g:3482:3: rule__MenuModel__PackagesAssignment_1
-            	    {
-            	    pushFollow(FOLLOW_6);
-            	    rule__MenuModel__PackagesAssignment_1();
-
-            	    state._fsp--;
-            	    if (state.failed) return ;
+            // InternalMenuDsl.g:3559:2: ( rule__MenuModel__MenupackageAssignment_1 )
+            // InternalMenuDsl.g:3559:3: rule__MenuModel__MenupackageAssignment_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuModel__MenupackageAssignment_1();
 
-            	    }
-            	    break;
+            state._fsp--;
+            if (state.failed) return ;
 
-            	default :
-            	    break loop48;
-                }
-            } while (true);
+            }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuModelAccess().getPackagesAssignment_1()); 
+               after(grammarAccess.getMenuModelAccess().getMenupackageAssignment_1()); 
             }
 
             }
@@ -13048,14 +13336,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__0"
-    // InternalMenuDsl.g:3491:1: rule__MenuPackage__Group__0 : rule__MenuPackage__Group__0__Impl rule__MenuPackage__Group__1 ;
+    // InternalMenuDsl.g:3568:1: rule__MenuPackage__Group__0 : rule__MenuPackage__Group__0__Impl rule__MenuPackage__Group__1 ;
     public final void rule__MenuPackage__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3495:1: ( rule__MenuPackage__Group__0__Impl rule__MenuPackage__Group__1 )
-            // InternalMenuDsl.g:3496:2: rule__MenuPackage__Group__0__Impl rule__MenuPackage__Group__1
+            // InternalMenuDsl.g:3572:1: ( rule__MenuPackage__Group__0__Impl rule__MenuPackage__Group__1 )
+            // InternalMenuDsl.g:3573:2: rule__MenuPackage__Group__0__Impl rule__MenuPackage__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__MenuPackage__Group__0__Impl();
@@ -13086,23 +13374,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__0__Impl"
-    // InternalMenuDsl.g:3503:1: rule__MenuPackage__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:3580:1: rule__MenuPackage__Group__0__Impl : ( () ) ;
     public final void rule__MenuPackage__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3507:1: ( ( () ) )
-            // InternalMenuDsl.g:3508:1: ( () )
+            // InternalMenuDsl.g:3584:1: ( ( () ) )
+            // InternalMenuDsl.g:3585:1: ( () )
             {
-            // InternalMenuDsl.g:3508:1: ( () )
-            // InternalMenuDsl.g:3509:2: ()
+            // InternalMenuDsl.g:3585:1: ( () )
+            // InternalMenuDsl.g:3586:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuPackageAccess().getMenuPackageAction_0()); 
             }
-            // InternalMenuDsl.g:3510:2: ()
-            // InternalMenuDsl.g:3510:3: 
+            // InternalMenuDsl.g:3587:2: ()
+            // InternalMenuDsl.g:3587:3: 
             {
             }
 
@@ -13127,16 +13415,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__1"
-    // InternalMenuDsl.g:3518:1: rule__MenuPackage__Group__1 : rule__MenuPackage__Group__1__Impl rule__MenuPackage__Group__2 ;
+    // InternalMenuDsl.g:3595:1: rule__MenuPackage__Group__1 : rule__MenuPackage__Group__1__Impl rule__MenuPackage__Group__2 ;
     public final void rule__MenuPackage__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3522:1: ( rule__MenuPackage__Group__1__Impl rule__MenuPackage__Group__2 )
-            // InternalMenuDsl.g:3523:2: rule__MenuPackage__Group__1__Impl rule__MenuPackage__Group__2
+            // InternalMenuDsl.g:3599:1: ( rule__MenuPackage__Group__1__Impl rule__MenuPackage__Group__2 )
+            // InternalMenuDsl.g:3600:2: rule__MenuPackage__Group__1__Impl rule__MenuPackage__Group__2
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__MenuPackage__Group__1__Impl();
 
             state._fsp--;
@@ -13165,17 +13453,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__1__Impl"
-    // InternalMenuDsl.g:3530:1: rule__MenuPackage__Group__1__Impl : ( 'package' ) ;
+    // InternalMenuDsl.g:3607:1: rule__MenuPackage__Group__1__Impl : ( 'package' ) ;
     public final void rule__MenuPackage__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3534:1: ( ( 'package' ) )
-            // InternalMenuDsl.g:3535:1: ( 'package' )
+            // InternalMenuDsl.g:3611:1: ( ( 'package' ) )
+            // InternalMenuDsl.g:3612:1: ( 'package' )
             {
-            // InternalMenuDsl.g:3535:1: ( 'package' )
-            // InternalMenuDsl.g:3536:2: 'package'
+            // InternalMenuDsl.g:3612:1: ( 'package' )
+            // InternalMenuDsl.g:3613:2: 'package'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuPackageAccess().getPackageKeyword_1()); 
@@ -13206,16 +13494,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__2"
-    // InternalMenuDsl.g:3545:1: rule__MenuPackage__Group__2 : rule__MenuPackage__Group__2__Impl rule__MenuPackage__Group__3 ;
+    // InternalMenuDsl.g:3622:1: rule__MenuPackage__Group__2 : rule__MenuPackage__Group__2__Impl rule__MenuPackage__Group__3 ;
     public final void rule__MenuPackage__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3549:1: ( rule__MenuPackage__Group__2__Impl rule__MenuPackage__Group__3 )
-            // InternalMenuDsl.g:3550:2: rule__MenuPackage__Group__2__Impl rule__MenuPackage__Group__3
+            // InternalMenuDsl.g:3626:1: ( rule__MenuPackage__Group__2__Impl rule__MenuPackage__Group__3 )
+            // InternalMenuDsl.g:3627:2: rule__MenuPackage__Group__2__Impl rule__MenuPackage__Group__3
             {
-            pushFollow(FOLLOW_8);
+            pushFollow(FOLLOW_7);
             rule__MenuPackage__Group__2__Impl();
 
             state._fsp--;
@@ -13244,23 +13532,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__2__Impl"
-    // InternalMenuDsl.g:3557:1: rule__MenuPackage__Group__2__Impl : ( ( rule__MenuPackage__NameAssignment_2 ) ) ;
+    // InternalMenuDsl.g:3634:1: rule__MenuPackage__Group__2__Impl : ( ( rule__MenuPackage__NameAssignment_2 ) ) ;
     public final void rule__MenuPackage__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3561:1: ( ( ( rule__MenuPackage__NameAssignment_2 ) ) )
-            // InternalMenuDsl.g:3562:1: ( ( rule__MenuPackage__NameAssignment_2 ) )
+            // InternalMenuDsl.g:3638:1: ( ( ( rule__MenuPackage__NameAssignment_2 ) ) )
+            // InternalMenuDsl.g:3639:1: ( ( rule__MenuPackage__NameAssignment_2 ) )
             {
-            // InternalMenuDsl.g:3562:1: ( ( rule__MenuPackage__NameAssignment_2 ) )
-            // InternalMenuDsl.g:3563:2: ( rule__MenuPackage__NameAssignment_2 )
+            // InternalMenuDsl.g:3639:1: ( ( rule__MenuPackage__NameAssignment_2 ) )
+            // InternalMenuDsl.g:3640:2: ( rule__MenuPackage__NameAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuPackageAccess().getNameAssignment_2()); 
             }
-            // InternalMenuDsl.g:3564:2: ( rule__MenuPackage__NameAssignment_2 )
-            // InternalMenuDsl.g:3564:3: rule__MenuPackage__NameAssignment_2
+            // InternalMenuDsl.g:3641:2: ( rule__MenuPackage__NameAssignment_2 )
+            // InternalMenuDsl.g:3641:3: rule__MenuPackage__NameAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__MenuPackage__NameAssignment_2();
@@ -13295,14 +13583,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__3"
-    // InternalMenuDsl.g:3572:1: rule__MenuPackage__Group__3 : rule__MenuPackage__Group__3__Impl ;
+    // InternalMenuDsl.g:3649:1: rule__MenuPackage__Group__3 : rule__MenuPackage__Group__3__Impl ;
     public final void rule__MenuPackage__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3576:1: ( rule__MenuPackage__Group__3__Impl )
-            // InternalMenuDsl.g:3577:2: rule__MenuPackage__Group__3__Impl
+            // InternalMenuDsl.g:3653:1: ( rule__MenuPackage__Group__3__Impl )
+            // InternalMenuDsl.g:3654:2: rule__MenuPackage__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__MenuPackage__Group__3__Impl();
@@ -13328,22 +13616,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group__3__Impl"
-    // InternalMenuDsl.g:3583:1: rule__MenuPackage__Group__3__Impl : ( ( rule__MenuPackage__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:3660:1: rule__MenuPackage__Group__3__Impl : ( ( rule__MenuPackage__Group_3__0 )? ) ;
     public final void rule__MenuPackage__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3587:1: ( ( ( rule__MenuPackage__Group_3__0 )? ) )
-            // InternalMenuDsl.g:3588:1: ( ( rule__MenuPackage__Group_3__0 )? )
+            // InternalMenuDsl.g:3664:1: ( ( ( rule__MenuPackage__Group_3__0 )? ) )
+            // InternalMenuDsl.g:3665:1: ( ( rule__MenuPackage__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:3588:1: ( ( rule__MenuPackage__Group_3__0 )? )
-            // InternalMenuDsl.g:3589:2: ( rule__MenuPackage__Group_3__0 )?
+            // InternalMenuDsl.g:3665:1: ( ( rule__MenuPackage__Group_3__0 )? )
+            // InternalMenuDsl.g:3666:2: ( rule__MenuPackage__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuPackageAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:3590:2: ( rule__MenuPackage__Group_3__0 )?
+            // InternalMenuDsl.g:3667:2: ( rule__MenuPackage__Group_3__0 )?
             int alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -13352,7 +13640,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
             switch (alt49) {
                 case 1 :
-                    // InternalMenuDsl.g:3590:3: rule__MenuPackage__Group_3__0
+                    // InternalMenuDsl.g:3667:3: rule__MenuPackage__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__MenuPackage__Group_3__0();
@@ -13390,16 +13678,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__0"
-    // InternalMenuDsl.g:3599:1: rule__MenuPackage__Group_3__0 : rule__MenuPackage__Group_3__0__Impl rule__MenuPackage__Group_3__1 ;
+    // InternalMenuDsl.g:3676:1: rule__MenuPackage__Group_3__0 : rule__MenuPackage__Group_3__0__Impl rule__MenuPackage__Group_3__1 ;
     public final void rule__MenuPackage__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3603:1: ( rule__MenuPackage__Group_3__0__Impl rule__MenuPackage__Group_3__1 )
-            // InternalMenuDsl.g:3604:2: rule__MenuPackage__Group_3__0__Impl rule__MenuPackage__Group_3__1
+            // InternalMenuDsl.g:3680:1: ( rule__MenuPackage__Group_3__0__Impl rule__MenuPackage__Group_3__1 )
+            // InternalMenuDsl.g:3681:2: rule__MenuPackage__Group_3__0__Impl rule__MenuPackage__Group_3__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_8);
             rule__MenuPackage__Group_3__0__Impl();
 
             state._fsp--;
@@ -13428,24 +13716,24 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__0__Impl"
-    // InternalMenuDsl.g:3611:1: rule__MenuPackage__Group_3__0__Impl : ( '{' ) ;
+    // InternalMenuDsl.g:3688:1: rule__MenuPackage__Group_3__0__Impl : ( 'expandedImage' ) ;
     public final void rule__MenuPackage__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3615:1: ( ( '{' ) )
-            // InternalMenuDsl.g:3616:1: ( '{' )
+            // InternalMenuDsl.g:3692:1: ( ( 'expandedImage' ) )
+            // InternalMenuDsl.g:3693:1: ( 'expandedImage' )
             {
-            // InternalMenuDsl.g:3616:1: ( '{' )
-            // InternalMenuDsl.g:3617:2: '{'
+            // InternalMenuDsl.g:3693:1: ( 'expandedImage' )
+            // InternalMenuDsl.g:3694:2: 'expandedImage'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getLeftCurlyBracketKeyword_3_0()); 
+               before(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_0()); 
             }
             match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getLeftCurlyBracketKeyword_3_0()); 
+               after(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_0()); 
             }
 
             }
@@ -13469,16 +13757,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__1"
-    // InternalMenuDsl.g:3626:1: rule__MenuPackage__Group_3__1 : rule__MenuPackage__Group_3__1__Impl rule__MenuPackage__Group_3__2 ;
+    // InternalMenuDsl.g:3703:1: rule__MenuPackage__Group_3__1 : rule__MenuPackage__Group_3__1__Impl rule__MenuPackage__Group_3__2 ;
     public final void rule__MenuPackage__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3630:1: ( rule__MenuPackage__Group_3__1__Impl rule__MenuPackage__Group_3__2 )
-            // InternalMenuDsl.g:3631:2: rule__MenuPackage__Group_3__1__Impl rule__MenuPackage__Group_3__2
+            // InternalMenuDsl.g:3707:1: ( rule__MenuPackage__Group_3__1__Impl rule__MenuPackage__Group_3__2 )
+            // InternalMenuDsl.g:3708:2: rule__MenuPackage__Group_3__1__Impl rule__MenuPackage__Group_3__2
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_9);
             rule__MenuPackage__Group_3__1__Impl();
 
             state._fsp--;
@@ -13507,24 +13795,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__1__Impl"
-    // InternalMenuDsl.g:3638:1: rule__MenuPackage__Group_3__1__Impl : ( 'expandedImage' ) ;
+    // InternalMenuDsl.g:3715:1: rule__MenuPackage__Group_3__1__Impl : ( ( rule__MenuPackage__ExpandedImageAssignment_3_1 ) ) ;
     public final void rule__MenuPackage__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3642:1: ( ( 'expandedImage' ) )
-            // InternalMenuDsl.g:3643:1: ( 'expandedImage' )
+            // InternalMenuDsl.g:3719:1: ( ( ( rule__MenuPackage__ExpandedImageAssignment_3_1 ) ) )
+            // InternalMenuDsl.g:3720:1: ( ( rule__MenuPackage__ExpandedImageAssignment_3_1 ) )
             {
-            // InternalMenuDsl.g:3643:1: ( 'expandedImage' )
-            // InternalMenuDsl.g:3644:2: 'expandedImage'
+            // InternalMenuDsl.g:3720:1: ( ( rule__MenuPackage__ExpandedImageAssignment_3_1 ) )
+            // InternalMenuDsl.g:3721:2: ( rule__MenuPackage__ExpandedImageAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_1()); 
+               before(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_1()); 
             }
-            match(input,53,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:3722:2: ( rule__MenuPackage__ExpandedImageAssignment_3_1 )
+            // InternalMenuDsl.g:3722:3: rule__MenuPackage__ExpandedImageAssignment_3_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuPackage__ExpandedImageAssignment_3_1();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_1()); 
+               after(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_1()); 
             }
 
             }
@@ -13548,16 +13846,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__2"
-    // InternalMenuDsl.g:3653:1: rule__MenuPackage__Group_3__2 : rule__MenuPackage__Group_3__2__Impl rule__MenuPackage__Group_3__3 ;
+    // InternalMenuDsl.g:3730:1: rule__MenuPackage__Group_3__2 : rule__MenuPackage__Group_3__2__Impl rule__MenuPackage__Group_3__3 ;
     public final void rule__MenuPackage__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3657:1: ( rule__MenuPackage__Group_3__2__Impl rule__MenuPackage__Group_3__3 )
-            // InternalMenuDsl.g:3658:2: rule__MenuPackage__Group_3__2__Impl rule__MenuPackage__Group_3__3
+            // InternalMenuDsl.g:3734:1: ( rule__MenuPackage__Group_3__2__Impl rule__MenuPackage__Group_3__3 )
+            // InternalMenuDsl.g:3735:2: rule__MenuPackage__Group_3__2__Impl rule__MenuPackage__Group_3__3
             {
-            pushFollow(FOLLOW_11);
+            pushFollow(FOLLOW_8);
             rule__MenuPackage__Group_3__2__Impl();
 
             state._fsp--;
@@ -13586,34 +13884,24 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__2__Impl"
-    // InternalMenuDsl.g:3665:1: rule__MenuPackage__Group_3__2__Impl : ( ( rule__MenuPackage__ExpandedImageAssignment_3_2 ) ) ;
+    // InternalMenuDsl.g:3742:1: rule__MenuPackage__Group_3__2__Impl : ( 'collapsedImage' ) ;
     public final void rule__MenuPackage__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3669:1: ( ( ( rule__MenuPackage__ExpandedImageAssignment_3_2 ) ) )
-            // InternalMenuDsl.g:3670:1: ( ( rule__MenuPackage__ExpandedImageAssignment_3_2 ) )
+            // InternalMenuDsl.g:3746:1: ( ( 'collapsedImage' ) )
+            // InternalMenuDsl.g:3747:1: ( 'collapsedImage' )
             {
-            // InternalMenuDsl.g:3670:1: ( ( rule__MenuPackage__ExpandedImageAssignment_3_2 ) )
-            // InternalMenuDsl.g:3671:2: ( rule__MenuPackage__ExpandedImageAssignment_3_2 )
+            // InternalMenuDsl.g:3747:1: ( 'collapsedImage' )
+            // InternalMenuDsl.g:3748:2: 'collapsedImage'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_2()); 
+               before(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_2()); 
             }
-            // InternalMenuDsl.g:3672:2: ( rule__MenuPackage__ExpandedImageAssignment_3_2 )
-            // InternalMenuDsl.g:3672:3: rule__MenuPackage__ExpandedImageAssignment_3_2
-            {
-            pushFollow(FOLLOW_2);
-            rule__MenuPackage__ExpandedImageAssignment_3_2();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
+            match(input,53,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getExpandedImageAssignment_3_2()); 
+               after(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_2()); 
             }
 
             }
@@ -13637,14 +13925,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__3"
-    // InternalMenuDsl.g:3680:1: rule__MenuPackage__Group_3__3 : rule__MenuPackage__Group_3__3__Impl rule__MenuPackage__Group_3__4 ;
+    // InternalMenuDsl.g:3757:1: rule__MenuPackage__Group_3__3 : rule__MenuPackage__Group_3__3__Impl rule__MenuPackage__Group_3__4 ;
     public final void rule__MenuPackage__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3684:1: ( rule__MenuPackage__Group_3__3__Impl rule__MenuPackage__Group_3__4 )
-            // InternalMenuDsl.g:3685:2: rule__MenuPackage__Group_3__3__Impl rule__MenuPackage__Group_3__4
+            // InternalMenuDsl.g:3761:1: ( rule__MenuPackage__Group_3__3__Impl rule__MenuPackage__Group_3__4 )
+            // InternalMenuDsl.g:3762:2: rule__MenuPackage__Group_3__3__Impl rule__MenuPackage__Group_3__4
             {
             pushFollow(FOLLOW_10);
             rule__MenuPackage__Group_3__3__Impl();
@@ -13675,24 +13963,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__3__Impl"
-    // InternalMenuDsl.g:3692:1: rule__MenuPackage__Group_3__3__Impl : ( 'collapsedImage' ) ;
+    // InternalMenuDsl.g:3769:1: rule__MenuPackage__Group_3__3__Impl : ( ( rule__MenuPackage__CollapsedImageAssignment_3_3 ) ) ;
     public final void rule__MenuPackage__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3696:1: ( ( 'collapsedImage' ) )
-            // InternalMenuDsl.g:3697:1: ( 'collapsedImage' )
+            // InternalMenuDsl.g:3773:1: ( ( ( rule__MenuPackage__CollapsedImageAssignment_3_3 ) ) )
+            // InternalMenuDsl.g:3774:1: ( ( rule__MenuPackage__CollapsedImageAssignment_3_3 ) )
             {
-            // InternalMenuDsl.g:3697:1: ( 'collapsedImage' )
-            // InternalMenuDsl.g:3698:2: 'collapsedImage'
+            // InternalMenuDsl.g:3774:1: ( ( rule__MenuPackage__CollapsedImageAssignment_3_3 ) )
+            // InternalMenuDsl.g:3775:2: ( rule__MenuPackage__CollapsedImageAssignment_3_3 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_3()); 
+               before(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_3()); 
             }
-            match(input,54,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:3776:2: ( rule__MenuPackage__CollapsedImageAssignment_3_3 )
+            // InternalMenuDsl.g:3776:3: rule__MenuPackage__CollapsedImageAssignment_3_3
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuPackage__CollapsedImageAssignment_3_3();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_3()); 
+               after(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_3()); 
             }
 
             }
@@ -13716,16 +14014,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__4"
-    // InternalMenuDsl.g:3707:1: rule__MenuPackage__Group_3__4 : rule__MenuPackage__Group_3__4__Impl rule__MenuPackage__Group_3__5 ;
+    // InternalMenuDsl.g:3784:1: rule__MenuPackage__Group_3__4 : rule__MenuPackage__Group_3__4__Impl rule__MenuPackage__Group_3__5 ;
     public final void rule__MenuPackage__Group_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3711:1: ( rule__MenuPackage__Group_3__4__Impl rule__MenuPackage__Group_3__5 )
-            // InternalMenuDsl.g:3712:2: rule__MenuPackage__Group_3__4__Impl rule__MenuPackage__Group_3__5
+            // InternalMenuDsl.g:3788:1: ( rule__MenuPackage__Group_3__4__Impl rule__MenuPackage__Group_3__5 )
+            // InternalMenuDsl.g:3789:2: rule__MenuPackage__Group_3__4__Impl rule__MenuPackage__Group_3__5
             {
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_10);
             rule__MenuPackage__Group_3__4__Impl();
 
             state._fsp--;
@@ -13754,34 +14052,45 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__4__Impl"
-    // InternalMenuDsl.g:3719:1: rule__MenuPackage__Group_3__4__Impl : ( ( rule__MenuPackage__CollapsedImageAssignment_3_4 ) ) ;
+    // InternalMenuDsl.g:3796:1: rule__MenuPackage__Group_3__4__Impl : ( ( rule__MenuPackage__Group_3_4__0 )? ) ;
     public final void rule__MenuPackage__Group_3__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3723:1: ( ( ( rule__MenuPackage__CollapsedImageAssignment_3_4 ) ) )
-            // InternalMenuDsl.g:3724:1: ( ( rule__MenuPackage__CollapsedImageAssignment_3_4 ) )
+            // InternalMenuDsl.g:3800:1: ( ( ( rule__MenuPackage__Group_3_4__0 )? ) )
+            // InternalMenuDsl.g:3801:1: ( ( rule__MenuPackage__Group_3_4__0 )? )
             {
-            // InternalMenuDsl.g:3724:1: ( ( rule__MenuPackage__CollapsedImageAssignment_3_4 ) )
-            // InternalMenuDsl.g:3725:2: ( rule__MenuPackage__CollapsedImageAssignment_3_4 )
+            // InternalMenuDsl.g:3801:1: ( ( rule__MenuPackage__Group_3_4__0 )? )
+            // InternalMenuDsl.g:3802:2: ( rule__MenuPackage__Group_3_4__0 )?
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_4()); 
+               before(grammarAccess.getMenuPackageAccess().getGroup_3_4()); 
             }
-            // InternalMenuDsl.g:3726:2: ( rule__MenuPackage__CollapsedImageAssignment_3_4 )
-            // InternalMenuDsl.g:3726:3: rule__MenuPackage__CollapsedImageAssignment_3_4
-            {
-            pushFollow(FOLLOW_2);
-            rule__MenuPackage__CollapsedImageAssignment_3_4();
+            // InternalMenuDsl.g:3803:2: ( rule__MenuPackage__Group_3_4__0 )?
+            int alt50=2;
+            int LA50_0 = input.LA(1);
 
-            state._fsp--;
-            if (state.failed) return ;
+            if ( (LA50_0==54) ) {
+                alt50=1;
+            }
+            switch (alt50) {
+                case 1 :
+                    // InternalMenuDsl.g:3803:3: rule__MenuPackage__Group_3_4__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__MenuPackage__Group_3_4__0();
+
+                    state._fsp--;
+                    if (state.failed) return ;
+
+                    }
+                    break;
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getCollapsedImageAssignment_3_4()); 
+               after(grammarAccess.getMenuPackageAccess().getGroup_3_4()); 
             }
 
             }
@@ -13805,16 +14114,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__5"
-    // InternalMenuDsl.g:3734:1: rule__MenuPackage__Group_3__5 : rule__MenuPackage__Group_3__5__Impl rule__MenuPackage__Group_3__6 ;
+    // InternalMenuDsl.g:3811:1: rule__MenuPackage__Group_3__5 : rule__MenuPackage__Group_3__5__Impl rule__MenuPackage__Group_3__6 ;
     public final void rule__MenuPackage__Group_3__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3738:1: ( rule__MenuPackage__Group_3__5__Impl rule__MenuPackage__Group_3__6 )
-            // InternalMenuDsl.g:3739:2: rule__MenuPackage__Group_3__5__Impl rule__MenuPackage__Group_3__6
+            // InternalMenuDsl.g:3815:1: ( rule__MenuPackage__Group_3__5__Impl rule__MenuPackage__Group_3__6 )
+            // InternalMenuDsl.g:3816:2: rule__MenuPackage__Group_3__5__Impl rule__MenuPackage__Group_3__6
             {
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_10);
             rule__MenuPackage__Group_3__5__Impl();
 
             state._fsp--;
@@ -13843,34 +14152,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__5__Impl"
-    // InternalMenuDsl.g:3746:1: rule__MenuPackage__Group_3__5__Impl : ( ( rule__MenuPackage__SubMenuIsAccordionAssignment_3_5 )? ) ;
+    // InternalMenuDsl.g:3823:1: rule__MenuPackage__Group_3__5__Impl : ( ( rule__MenuPackage__Group_3_5__0 )? ) ;
     public final void rule__MenuPackage__Group_3__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3750:1: ( ( ( rule__MenuPackage__SubMenuIsAccordionAssignment_3_5 )? ) )
-            // InternalMenuDsl.g:3751:1: ( ( rule__MenuPackage__SubMenuIsAccordionAssignment_3_5 )? )
+            // InternalMenuDsl.g:3827:1: ( ( ( rule__MenuPackage__Group_3_5__0 )? ) )
+            // InternalMenuDsl.g:3828:1: ( ( rule__MenuPackage__Group_3_5__0 )? )
             {
-            // InternalMenuDsl.g:3751:1: ( ( rule__MenuPackage__SubMenuIsAccordionAssignment_3_5 )? )
-            // InternalMenuDsl.g:3752:2: ( rule__MenuPackage__SubMenuIsAccordionAssignment_3_5 )?
+            // InternalMenuDsl.g:3828:1: ( ( rule__MenuPackage__Group_3_5__0 )? )
+            // InternalMenuDsl.g:3829:2: ( rule__MenuPackage__Group_3_5__0 )?
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAssignment_3_5()); 
+               before(grammarAccess.getMenuPackageAccess().getGroup_3_5()); 
             }
-            // InternalMenuDsl.g:3753:2: ( rule__MenuPackage__SubMenuIsAccordionAssignment_3_5 )?
-            int alt50=2;
-            int LA50_0 = input.LA(1);
+            // InternalMenuDsl.g:3830:2: ( rule__MenuPackage__Group_3_5__0 )?
+            int alt51=2;
+            int LA51_0 = input.LA(1);
 
-            if ( (LA50_0==89) ) {
-                alt50=1;
+            if ( (LA51_0==55) ) {
+                alt51=1;
             }
-            switch (alt50) {
+            switch (alt51) {
                 case 1 :
-                    // InternalMenuDsl.g:3753:3: rule__MenuPackage__SubMenuIsAccordionAssignment_3_5
+                    // InternalMenuDsl.g:3830:3: rule__MenuPackage__Group_3_5__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuPackage__SubMenuIsAccordionAssignment_3_5();
+                    rule__MenuPackage__Group_3_5__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -13881,7 +14190,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAssignment_3_5()); 
+               after(grammarAccess.getMenuPackageAccess().getGroup_3_5()); 
             }
 
             }
@@ -13905,16 +14214,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__6"
-    // InternalMenuDsl.g:3761:1: rule__MenuPackage__Group_3__6 : rule__MenuPackage__Group_3__6__Impl rule__MenuPackage__Group_3__7 ;
+    // InternalMenuDsl.g:3838:1: rule__MenuPackage__Group_3__6 : rule__MenuPackage__Group_3__6__Impl rule__MenuPackage__Group_3__7 ;
     public final void rule__MenuPackage__Group_3__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3765:1: ( rule__MenuPackage__Group_3__6__Impl rule__MenuPackage__Group_3__7 )
-            // InternalMenuDsl.g:3766:2: rule__MenuPackage__Group_3__6__Impl rule__MenuPackage__Group_3__7
+            // InternalMenuDsl.g:3842:1: ( rule__MenuPackage__Group_3__6__Impl rule__MenuPackage__Group_3__7 )
+            // InternalMenuDsl.g:3843:2: rule__MenuPackage__Group_3__6__Impl rule__MenuPackage__Group_3__7
             {
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_10);
             rule__MenuPackage__Group_3__6__Impl();
 
             state._fsp--;
@@ -13943,34 +14252,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__6__Impl"
-    // InternalMenuDsl.g:3773:1: rule__MenuPackage__Group_3__6__Impl : ( ( rule__MenuPackage__Group_3_6__0 )? ) ;
+    // InternalMenuDsl.g:3850:1: rule__MenuPackage__Group_3__6__Impl : ( ( rule__MenuPackage__HasDesignerAssignment_3_6 )? ) ;
     public final void rule__MenuPackage__Group_3__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3777:1: ( ( ( rule__MenuPackage__Group_3_6__0 )? ) )
-            // InternalMenuDsl.g:3778:1: ( ( rule__MenuPackage__Group_3_6__0 )? )
+            // InternalMenuDsl.g:3854:1: ( ( ( rule__MenuPackage__HasDesignerAssignment_3_6 )? ) )
+            // InternalMenuDsl.g:3855:1: ( ( rule__MenuPackage__HasDesignerAssignment_3_6 )? )
             {
-            // InternalMenuDsl.g:3778:1: ( ( rule__MenuPackage__Group_3_6__0 )? )
-            // InternalMenuDsl.g:3779:2: ( rule__MenuPackage__Group_3_6__0 )?
+            // InternalMenuDsl.g:3855:1: ( ( rule__MenuPackage__HasDesignerAssignment_3_6 )? )
+            // InternalMenuDsl.g:3856:2: ( rule__MenuPackage__HasDesignerAssignment_3_6 )?
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getGroup_3_6()); 
+               before(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_6()); 
             }
-            // InternalMenuDsl.g:3780:2: ( rule__MenuPackage__Group_3_6__0 )?
-            int alt51=2;
-            int LA51_0 = input.LA(1);
+            // InternalMenuDsl.g:3857:2: ( rule__MenuPackage__HasDesignerAssignment_3_6 )?
+            int alt52=2;
+            int LA52_0 = input.LA(1);
 
-            if ( (LA51_0==56) ) {
-                alt51=1;
+            if ( (LA52_0==91) ) {
+                alt52=1;
             }
-            switch (alt51) {
+            switch (alt52) {
                 case 1 :
-                    // InternalMenuDsl.g:3780:3: rule__MenuPackage__Group_3_6__0
+                    // InternalMenuDsl.g:3857:3: rule__MenuPackage__HasDesignerAssignment_3_6
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuPackage__Group_3_6__0();
+                    rule__MenuPackage__HasDesignerAssignment_3_6();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -13981,7 +14290,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getGroup_3_6()); 
+               after(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_6()); 
             }
 
             }
@@ -14005,22 +14314,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__7"
-    // InternalMenuDsl.g:3788:1: rule__MenuPackage__Group_3__7 : rule__MenuPackage__Group_3__7__Impl rule__MenuPackage__Group_3__8 ;
+    // InternalMenuDsl.g:3865:1: rule__MenuPackage__Group_3__7 : rule__MenuPackage__Group_3__7__Impl ;
     public final void rule__MenuPackage__Group_3__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3792:1: ( rule__MenuPackage__Group_3__7__Impl rule__MenuPackage__Group_3__8 )
-            // InternalMenuDsl.g:3793:2: rule__MenuPackage__Group_3__7__Impl rule__MenuPackage__Group_3__8
+            // InternalMenuDsl.g:3869:1: ( rule__MenuPackage__Group_3__7__Impl )
+            // InternalMenuDsl.g:3870:2: rule__MenuPackage__Group_3__7__Impl
             {
-            pushFollow(FOLLOW_12);
-            rule__MenuPackage__Group_3__7__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3__8();
+            rule__MenuPackage__Group_3__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14043,45 +14347,52 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuPackage__Group_3__7__Impl"
-    // InternalMenuDsl.g:3800:1: rule__MenuPackage__Group_3__7__Impl : ( ( rule__MenuPackage__Group_3_7__0 )? ) ;
+    // InternalMenuDsl.g:3876:1: rule__MenuPackage__Group_3__7__Impl : ( ( rule__MenuPackage__CategoriesAssignment_3_7 )* ) ;
     public final void rule__MenuPackage__Group_3__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3804:1: ( ( ( rule__MenuPackage__Group_3_7__0 )? ) )
-            // InternalMenuDsl.g:3805:1: ( ( rule__MenuPackage__Group_3_7__0 )? )
+            // InternalMenuDsl.g:3880:1: ( ( ( rule__MenuPackage__CategoriesAssignment_3_7 )* ) )
+            // InternalMenuDsl.g:3881:1: ( ( rule__MenuPackage__CategoriesAssignment_3_7 )* )
             {
-            // InternalMenuDsl.g:3805:1: ( ( rule__MenuPackage__Group_3_7__0 )? )
-            // InternalMenuDsl.g:3806:2: ( rule__MenuPackage__Group_3_7__0 )?
+            // InternalMenuDsl.g:3881:1: ( ( rule__MenuPackage__CategoriesAssignment_3_7 )* )
+            // InternalMenuDsl.g:3882:2: ( rule__MenuPackage__CategoriesAssignment_3_7 )*
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getGroup_3_7()); 
+               before(grammarAccess.getMenuPackageAccess().getCategoriesAssignment_3_7()); 
             }
-            // InternalMenuDsl.g:3807:2: ( rule__MenuPackage__Group_3_7__0 )?
-            int alt52=2;
-            int LA52_0 = input.LA(1);
+            // InternalMenuDsl.g:3883:2: ( rule__MenuPackage__CategoriesAssignment_3_7 )*
+            loop53:
+            do {
+                int alt53=2;
+                int LA53_0 = input.LA(1);
 
-            if ( (LA52_0==57) ) {
-                alt52=1;
-            }
-            switch (alt52) {
-                case 1 :
-                    // InternalMenuDsl.g:3807:3: rule__MenuPackage__Group_3_7__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__MenuPackage__Group_3_7__0();
+                if ( (LA53_0==56) ) {
+                    alt53=1;
+                }
 
-                    state._fsp--;
-                    if (state.failed) return ;
 
-                    }
-                    break;
+                switch (alt53) {
+            	case 1 :
+            	    // InternalMenuDsl.g:3883:3: rule__MenuPackage__CategoriesAssignment_3_7
+            	    {
+            	    pushFollow(FOLLOW_11);
+            	    rule__MenuPackage__CategoriesAssignment_3_7();
 
-            }
+            	    state._fsp--;
+            	    if (state.failed) return ;
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop53;
+                }
+            } while (true);
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getGroup_3_7()); 
+               after(grammarAccess.getMenuPackageAccess().getCategoriesAssignment_3_7()); 
             }
 
             }
@@ -14104,23 +14415,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__MenuPackage__Group_3__7__Impl"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3__8"
-    // InternalMenuDsl.g:3815:1: rule__MenuPackage__Group_3__8 : rule__MenuPackage__Group_3__8__Impl rule__MenuPackage__Group_3__9 ;
-    public final void rule__MenuPackage__Group_3__8() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__Group_3_4__0"
+    // InternalMenuDsl.g:3892:1: rule__MenuPackage__Group_3_4__0 : rule__MenuPackage__Group_3_4__0__Impl rule__MenuPackage__Group_3_4__1 ;
+    public final void rule__MenuPackage__Group_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3819:1: ( rule__MenuPackage__Group_3__8__Impl rule__MenuPackage__Group_3__9 )
-            // InternalMenuDsl.g:3820:2: rule__MenuPackage__Group_3__8__Impl rule__MenuPackage__Group_3__9
+            // InternalMenuDsl.g:3896:1: ( rule__MenuPackage__Group_3_4__0__Impl rule__MenuPackage__Group_3_4__1 )
+            // InternalMenuDsl.g:3897:2: rule__MenuPackage__Group_3_4__0__Impl rule__MenuPackage__Group_3_4__1
             {
-            pushFollow(FOLLOW_12);
-            rule__MenuPackage__Group_3__8__Impl();
+            pushFollow(FOLLOW_8);
+            rule__MenuPackage__Group_3_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3__9();
+            rule__MenuPackage__Group_3_4__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14139,49 +14450,112 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3__8"
+    // $ANTLR end "rule__MenuPackage__Group_3_4__0"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3__8__Impl"
-    // InternalMenuDsl.g:3827:1: rule__MenuPackage__Group_3__8__Impl : ( ( rule__MenuPackage__HasDesignerAssignment_3_8 )? ) ;
-    public final void rule__MenuPackage__Group_3__8__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__Group_3_4__0__Impl"
+    // InternalMenuDsl.g:3904:1: rule__MenuPackage__Group_3_4__0__Impl : ( 'height' ) ;
+    public final void rule__MenuPackage__Group_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3831:1: ( ( ( rule__MenuPackage__HasDesignerAssignment_3_8 )? ) )
-            // InternalMenuDsl.g:3832:1: ( ( rule__MenuPackage__HasDesignerAssignment_3_8 )? )
+            // InternalMenuDsl.g:3908:1: ( ( 'height' ) )
+            // InternalMenuDsl.g:3909:1: ( 'height' )
             {
-            // InternalMenuDsl.g:3832:1: ( ( rule__MenuPackage__HasDesignerAssignment_3_8 )? )
-            // InternalMenuDsl.g:3833:2: ( rule__MenuPackage__HasDesignerAssignment_3_8 )?
+            // InternalMenuDsl.g:3909:1: ( 'height' )
+            // InternalMenuDsl.g:3910:2: 'height'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_8()); 
+               before(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_4_0()); 
+            }
+            match(input,54,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_4_0()); 
             }
-            // InternalMenuDsl.g:3834:2: ( rule__MenuPackage__HasDesignerAssignment_3_8 )?
-            int alt53=2;
-            int LA53_0 = input.LA(1);
 
-            if ( (LA53_0==90) ) {
-                alt53=1;
             }
-            switch (alt53) {
-                case 1 :
-                    // InternalMenuDsl.g:3834:3: rule__MenuPackage__HasDesignerAssignment_3_8
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__MenuPackage__HasDesignerAssignment_3_8();
 
-                    state._fsp--;
-                    if (state.failed) return ;
 
-                    }
-                    break;
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuPackage__Group_3_4__0__Impl"
+
+
+    // $ANTLR start "rule__MenuPackage__Group_3_4__1"
+    // InternalMenuDsl.g:3919:1: rule__MenuPackage__Group_3_4__1 : rule__MenuPackage__Group_3_4__1__Impl ;
+    public final void rule__MenuPackage__Group_3_4__1() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:3923:1: ( rule__MenuPackage__Group_3_4__1__Impl )
+            // InternalMenuDsl.g:3924:2: rule__MenuPackage__Group_3_4__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuPackage__Group_3_4__1__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
 
             }
 
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuPackage__Group_3_4__1"
+
+
+    // $ANTLR start "rule__MenuPackage__Group_3_4__1__Impl"
+    // InternalMenuDsl.g:3930:1: rule__MenuPackage__Group_3_4__1__Impl : ( ( rule__MenuPackage__HeightAssignment_3_4_1 ) ) ;
+    public final void rule__MenuPackage__Group_3_4__1__Impl() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:3934:1: ( ( ( rule__MenuPackage__HeightAssignment_3_4_1 ) ) )
+            // InternalMenuDsl.g:3935:1: ( ( rule__MenuPackage__HeightAssignment_3_4_1 ) )
+            {
+            // InternalMenuDsl.g:3935:1: ( ( rule__MenuPackage__HeightAssignment_3_4_1 ) )
+            // InternalMenuDsl.g:3936:2: ( rule__MenuPackage__HeightAssignment_3_4_1 )
+            {
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getHasDesignerAssignment_3_8()); 
+               before(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_4_1()); 
+            }
+            // InternalMenuDsl.g:3937:2: ( rule__MenuPackage__HeightAssignment_3_4_1 )
+            // InternalMenuDsl.g:3937:3: rule__MenuPackage__HeightAssignment_3_4_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuPackage__HeightAssignment_3_4_1();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_4_1()); 
             }
 
             }
@@ -14201,26 +14575,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3__8__Impl"
+    // $ANTLR end "rule__MenuPackage__Group_3_4__1__Impl"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3__9"
-    // InternalMenuDsl.g:3842:1: rule__MenuPackage__Group_3__9 : rule__MenuPackage__Group_3__9__Impl rule__MenuPackage__Group_3__10 ;
-    public final void rule__MenuPackage__Group_3__9() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__Group_3_5__0"
+    // InternalMenuDsl.g:3946:1: rule__MenuPackage__Group_3_5__0 : rule__MenuPackage__Group_3_5__0__Impl rule__MenuPackage__Group_3_5__1 ;
+    public final void rule__MenuPackage__Group_3_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3846:1: ( rule__MenuPackage__Group_3__9__Impl rule__MenuPackage__Group_3__10 )
-            // InternalMenuDsl.g:3847:2: rule__MenuPackage__Group_3__9__Impl rule__MenuPackage__Group_3__10
+            // InternalMenuDsl.g:3950:1: ( rule__MenuPackage__Group_3_5__0__Impl rule__MenuPackage__Group_3_5__1 )
+            // InternalMenuDsl.g:3951:2: rule__MenuPackage__Group_3_5__0__Impl rule__MenuPackage__Group_3_5__1
             {
-            pushFollow(FOLLOW_12);
-            rule__MenuPackage__Group_3__9__Impl();
+            pushFollow(FOLLOW_8);
+            rule__MenuPackage__Group_3_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3__10();
+            rule__MenuPackage__Group_3_5__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14239,56 +14613,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3__9"
+    // $ANTLR end "rule__MenuPackage__Group_3_5__0"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3__9__Impl"
-    // InternalMenuDsl.g:3854:1: rule__MenuPackage__Group_3__9__Impl : ( ( rule__MenuPackage__EntriesAssignment_3_9 )* ) ;
-    public final void rule__MenuPackage__Group_3__9__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__Group_3_5__0__Impl"
+    // InternalMenuDsl.g:3958:1: rule__MenuPackage__Group_3_5__0__Impl : ( 'width' ) ;
+    public final void rule__MenuPackage__Group_3_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3858:1: ( ( ( rule__MenuPackage__EntriesAssignment_3_9 )* ) )
-            // InternalMenuDsl.g:3859:1: ( ( rule__MenuPackage__EntriesAssignment_3_9 )* )
+            // InternalMenuDsl.g:3962:1: ( ( 'width' ) )
+            // InternalMenuDsl.g:3963:1: ( 'width' )
             {
-            // InternalMenuDsl.g:3859:1: ( ( rule__MenuPackage__EntriesAssignment_3_9 )* )
-            // InternalMenuDsl.g:3860:2: ( rule__MenuPackage__EntriesAssignment_3_9 )*
+            // InternalMenuDsl.g:3963:1: ( 'width' )
+            // InternalMenuDsl.g:3964:2: 'width'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getEntriesAssignment_3_9()); 
+               before(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_5_0()); 
             }
-            // InternalMenuDsl.g:3861:2: ( rule__MenuPackage__EntriesAssignment_3_9 )*
-            loop54:
-            do {
-                int alt54=2;
-                int LA54_0 = input.LA(1);
-
-                if ( (LA54_0==58) ) {
-                    alt54=1;
-                }
-
-
-                switch (alt54) {
-            	case 1 :
-            	    // InternalMenuDsl.g:3861:3: rule__MenuPackage__EntriesAssignment_3_9
-            	    {
-            	    pushFollow(FOLLOW_13);
-            	    rule__MenuPackage__EntriesAssignment_3_9();
-
-            	    state._fsp--;
-            	    if (state.failed) return ;
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop54;
-                }
-            } while (true);
-
+            match(input,55,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getEntriesAssignment_3_9()); 
+               after(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_5_0()); 
             }
 
             }
@@ -14308,21 +14654,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3__9__Impl"
+    // $ANTLR end "rule__MenuPackage__Group_3_5__0__Impl"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3__10"
-    // InternalMenuDsl.g:3869:1: rule__MenuPackage__Group_3__10 : rule__MenuPackage__Group_3__10__Impl ;
-    public final void rule__MenuPackage__Group_3__10() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__Group_3_5__1"
+    // InternalMenuDsl.g:3973:1: rule__MenuPackage__Group_3_5__1 : rule__MenuPackage__Group_3_5__1__Impl ;
+    public final void rule__MenuPackage__Group_3_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3873:1: ( rule__MenuPackage__Group_3__10__Impl )
-            // InternalMenuDsl.g:3874:2: rule__MenuPackage__Group_3__10__Impl
+            // InternalMenuDsl.g:3977:1: ( rule__MenuPackage__Group_3_5__1__Impl )
+            // InternalMenuDsl.g:3978:2: rule__MenuPackage__Group_3_5__1__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3__10__Impl();
+            rule__MenuPackage__Group_3_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14341,28 +14687,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3__10"
+    // $ANTLR end "rule__MenuPackage__Group_3_5__1"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3__10__Impl"
-    // InternalMenuDsl.g:3880:1: rule__MenuPackage__Group_3__10__Impl : ( '}' ) ;
-    public final void rule__MenuPackage__Group_3__10__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__Group_3_5__1__Impl"
+    // InternalMenuDsl.g:3984:1: rule__MenuPackage__Group_3_5__1__Impl : ( ( rule__MenuPackage__WidthAssignment_3_5_1 ) ) ;
+    public final void rule__MenuPackage__Group_3_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3884:1: ( ( '}' ) )
-            // InternalMenuDsl.g:3885:1: ( '}' )
+            // InternalMenuDsl.g:3988:1: ( ( ( rule__MenuPackage__WidthAssignment_3_5_1 ) ) )
+            // InternalMenuDsl.g:3989:1: ( ( rule__MenuPackage__WidthAssignment_3_5_1 ) )
             {
-            // InternalMenuDsl.g:3885:1: ( '}' )
-            // InternalMenuDsl.g:3886:2: '}'
+            // InternalMenuDsl.g:3989:1: ( ( rule__MenuPackage__WidthAssignment_3_5_1 ) )
+            // InternalMenuDsl.g:3990:2: ( rule__MenuPackage__WidthAssignment_3_5_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getRightCurlyBracketKeyword_3_10()); 
+               before(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_5_1()); 
             }
-            match(input,55,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:3991:2: ( rule__MenuPackage__WidthAssignment_3_5_1 )
+            // InternalMenuDsl.g:3991:3: rule__MenuPackage__WidthAssignment_3_5_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuPackage__WidthAssignment_3_5_1();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getRightCurlyBracketKeyword_3_10()); 
+               after(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_5_1()); 
             }
 
             }
@@ -14382,26 +14738,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3__10__Impl"
+    // $ANTLR end "rule__MenuPackage__Group_3_5__1__Impl"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_6__0"
-    // InternalMenuDsl.g:3896:1: rule__MenuPackage__Group_3_6__0 : rule__MenuPackage__Group_3_6__0__Impl rule__MenuPackage__Group_3_6__1 ;
-    public final void rule__MenuPackage__Group_3_6__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group__0"
+    // InternalMenuDsl.g:4000:1: rule__MenuCategory__Group__0 : rule__MenuCategory__Group__0__Impl rule__MenuCategory__Group__1 ;
+    public final void rule__MenuCategory__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3900:1: ( rule__MenuPackage__Group_3_6__0__Impl rule__MenuPackage__Group_3_6__1 )
-            // InternalMenuDsl.g:3901:2: rule__MenuPackage__Group_3_6__0__Impl rule__MenuPackage__Group_3_6__1
+            // InternalMenuDsl.g:4004:1: ( rule__MenuCategory__Group__0__Impl rule__MenuCategory__Group__1 )
+            // InternalMenuDsl.g:4005:2: rule__MenuCategory__Group__0__Impl rule__MenuCategory__Group__1
             {
-            pushFollow(FOLLOW_10);
-            rule__MenuPackage__Group_3_6__0__Impl();
+            pushFollow(FOLLOW_6);
+            rule__MenuCategory__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3_6__1();
+            rule__MenuCategory__Group__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14420,28 +14776,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_6__0"
+    // $ANTLR end "rule__MenuCategory__Group__0"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_6__0__Impl"
-    // InternalMenuDsl.g:3908:1: rule__MenuPackage__Group_3_6__0__Impl : ( 'height' ) ;
-    public final void rule__MenuPackage__Group_3_6__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group__0__Impl"
+    // InternalMenuDsl.g:4012:1: rule__MenuCategory__Group__0__Impl : ( 'category' ) ;
+    public final void rule__MenuCategory__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3912:1: ( ( 'height' ) )
-            // InternalMenuDsl.g:3913:1: ( 'height' )
+            // InternalMenuDsl.g:4016:1: ( ( 'category' ) )
+            // InternalMenuDsl.g:4017:1: ( 'category' )
             {
-            // InternalMenuDsl.g:3913:1: ( 'height' )
-            // InternalMenuDsl.g:3914:2: 'height'
+            // InternalMenuDsl.g:4017:1: ( 'category' )
+            // InternalMenuDsl.g:4018:2: 'category'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_6_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getCategoryKeyword_0()); 
             }
             match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getHeightKeyword_3_6_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getCategoryKeyword_0()); 
             }
 
             }
@@ -14461,21 +14817,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_6__0__Impl"
+    // $ANTLR end "rule__MenuCategory__Group__0__Impl"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_6__1"
-    // InternalMenuDsl.g:3923:1: rule__MenuPackage__Group_3_6__1 : rule__MenuPackage__Group_3_6__1__Impl ;
-    public final void rule__MenuPackage__Group_3_6__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group__1"
+    // InternalMenuDsl.g:4027:1: rule__MenuCategory__Group__1 : rule__MenuCategory__Group__1__Impl rule__MenuCategory__Group__2 ;
+    public final void rule__MenuCategory__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3927:1: ( rule__MenuPackage__Group_3_6__1__Impl )
-            // InternalMenuDsl.g:3928:2: rule__MenuPackage__Group_3_6__1__Impl
+            // InternalMenuDsl.g:4031:1: ( rule__MenuCategory__Group__1__Impl rule__MenuCategory__Group__2 )
+            // InternalMenuDsl.g:4032:2: rule__MenuCategory__Group__1__Impl rule__MenuCategory__Group__2
             {
+            pushFollow(FOLLOW_12);
+            rule__MenuCategory__Group__1__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3_6__1__Impl();
+            rule__MenuCategory__Group__2();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14494,30 +14855,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_6__1"
+    // $ANTLR end "rule__MenuCategory__Group__1"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_6__1__Impl"
-    // InternalMenuDsl.g:3934:1: rule__MenuPackage__Group_3_6__1__Impl : ( ( rule__MenuPackage__HeightAssignment_3_6_1 ) ) ;
-    public final void rule__MenuPackage__Group_3_6__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group__1__Impl"
+    // InternalMenuDsl.g:4039:1: rule__MenuCategory__Group__1__Impl : ( ( rule__MenuCategory__NameAssignment_1 ) ) ;
+    public final void rule__MenuCategory__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3938:1: ( ( ( rule__MenuPackage__HeightAssignment_3_6_1 ) ) )
-            // InternalMenuDsl.g:3939:1: ( ( rule__MenuPackage__HeightAssignment_3_6_1 ) )
+            // InternalMenuDsl.g:4043:1: ( ( ( rule__MenuCategory__NameAssignment_1 ) ) )
+            // InternalMenuDsl.g:4044:1: ( ( rule__MenuCategory__NameAssignment_1 ) )
             {
-            // InternalMenuDsl.g:3939:1: ( ( rule__MenuPackage__HeightAssignment_3_6_1 ) )
-            // InternalMenuDsl.g:3940:2: ( rule__MenuPackage__HeightAssignment_3_6_1 )
+            // InternalMenuDsl.g:4044:1: ( ( rule__MenuCategory__NameAssignment_1 ) )
+            // InternalMenuDsl.g:4045:2: ( rule__MenuCategory__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_6_1()); 
+               before(grammarAccess.getMenuCategoryAccess().getNameAssignment_1()); 
             }
-            // InternalMenuDsl.g:3941:2: ( rule__MenuPackage__HeightAssignment_3_6_1 )
-            // InternalMenuDsl.g:3941:3: rule__MenuPackage__HeightAssignment_3_6_1
+            // InternalMenuDsl.g:4046:2: ( rule__MenuCategory__NameAssignment_1 )
+            // InternalMenuDsl.g:4046:3: rule__MenuCategory__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__HeightAssignment_3_6_1();
+            rule__MenuCategory__NameAssignment_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14525,7 +14886,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getHeightAssignment_3_6_1()); 
+               after(grammarAccess.getMenuCategoryAccess().getNameAssignment_1()); 
             }
 
             }
@@ -14545,26 +14906,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_6__1__Impl"
+    // $ANTLR end "rule__MenuCategory__Group__1__Impl"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_7__0"
-    // InternalMenuDsl.g:3950:1: rule__MenuPackage__Group_3_7__0 : rule__MenuPackage__Group_3_7__0__Impl rule__MenuPackage__Group_3_7__1 ;
-    public final void rule__MenuPackage__Group_3_7__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group__2"
+    // InternalMenuDsl.g:4054:1: rule__MenuCategory__Group__2 : rule__MenuCategory__Group__2__Impl ;
+    public final void rule__MenuCategory__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3954:1: ( rule__MenuPackage__Group_3_7__0__Impl rule__MenuPackage__Group_3_7__1 )
-            // InternalMenuDsl.g:3955:2: rule__MenuPackage__Group_3_7__0__Impl rule__MenuPackage__Group_3_7__1
+            // InternalMenuDsl.g:4058:1: ( rule__MenuCategory__Group__2__Impl )
+            // InternalMenuDsl.g:4059:2: rule__MenuCategory__Group__2__Impl
             {
-            pushFollow(FOLLOW_10);
-            rule__MenuPackage__Group_3_7__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3_7__1();
+            rule__MenuCategory__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14583,28 +14939,49 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_7__0"
+    // $ANTLR end "rule__MenuCategory__Group__2"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_7__0__Impl"
-    // InternalMenuDsl.g:3962:1: rule__MenuPackage__Group_3_7__0__Impl : ( 'width' ) ;
-    public final void rule__MenuPackage__Group_3_7__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group__2__Impl"
+    // InternalMenuDsl.g:4065:1: rule__MenuCategory__Group__2__Impl : ( ( rule__MenuCategory__Alternatives_2 )? ) ;
+    public final void rule__MenuCategory__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3966:1: ( ( 'width' ) )
-            // InternalMenuDsl.g:3967:1: ( 'width' )
+            // InternalMenuDsl.g:4069:1: ( ( ( rule__MenuCategory__Alternatives_2 )? ) )
+            // InternalMenuDsl.g:4070:1: ( ( rule__MenuCategory__Alternatives_2 )? )
             {
-            // InternalMenuDsl.g:3967:1: ( 'width' )
-            // InternalMenuDsl.g:3968:2: 'width'
+            // InternalMenuDsl.g:4070:1: ( ( rule__MenuCategory__Alternatives_2 )? )
+            // InternalMenuDsl.g:4071:2: ( rule__MenuCategory__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_7_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getAlternatives_2()); 
             }
-            match(input,57,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:4072:2: ( rule__MenuCategory__Alternatives_2 )?
+            int alt54=2;
+            int LA54_0 = input.LA(1);
+
+            if ( (LA54_0==57||(LA54_0>=92 && LA54_0<=97)) ) {
+                alt54=1;
+            }
+            switch (alt54) {
+                case 1 :
+                    // InternalMenuDsl.g:4072:3: rule__MenuCategory__Alternatives_2
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__MenuCategory__Alternatives_2();
+
+                    state._fsp--;
+                    if (state.failed) return ;
+
+                    }
+                    break;
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getWidthKeyword_3_7_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getAlternatives_2()); 
             }
 
             }
@@ -14624,21 +15001,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_7__0__Impl"
+    // $ANTLR end "rule__MenuCategory__Group__2__Impl"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_7__1"
-    // InternalMenuDsl.g:3977:1: rule__MenuPackage__Group_3_7__1 : rule__MenuPackage__Group_3_7__1__Impl ;
-    public final void rule__MenuPackage__Group_3_7__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_0__0"
+    // InternalMenuDsl.g:4081:1: rule__MenuCategory__Group_2_0__0 : rule__MenuCategory__Group_2_0__0__Impl rule__MenuCategory__Group_2_0__1 ;
+    public final void rule__MenuCategory__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3981:1: ( rule__MenuPackage__Group_3_7__1__Impl )
-            // InternalMenuDsl.g:3982:2: rule__MenuPackage__Group_3_7__1__Impl
+            // InternalMenuDsl.g:4085:1: ( rule__MenuCategory__Group_2_0__0__Impl rule__MenuCategory__Group_2_0__1 )
+            // InternalMenuDsl.g:4086:2: rule__MenuCategory__Group_2_0__0__Impl rule__MenuCategory__Group_2_0__1
             {
+            pushFollow(FOLLOW_6);
+            rule__MenuCategory__Group_2_0__0__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__Group_3_7__1__Impl();
+            rule__MenuCategory__Group_2_0__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14657,30 +15039,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_7__1"
+    // $ANTLR end "rule__MenuCategory__Group_2_0__0"
 
 
-    // $ANTLR start "rule__MenuPackage__Group_3_7__1__Impl"
-    // InternalMenuDsl.g:3988:1: rule__MenuPackage__Group_3_7__1__Impl : ( ( rule__MenuPackage__WidthAssignment_3_7_1 ) ) ;
-    public final void rule__MenuPackage__Group_3_7__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_0__0__Impl"
+    // InternalMenuDsl.g:4093:1: rule__MenuCategory__Group_2_0__0__Impl : ( ( rule__MenuCategory__HasTableAssignment_2_0_0 ) ) ;
+    public final void rule__MenuCategory__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:3992:1: ( ( ( rule__MenuPackage__WidthAssignment_3_7_1 ) ) )
-            // InternalMenuDsl.g:3993:1: ( ( rule__MenuPackage__WidthAssignment_3_7_1 ) )
+            // InternalMenuDsl.g:4097:1: ( ( ( rule__MenuCategory__HasTableAssignment_2_0_0 ) ) )
+            // InternalMenuDsl.g:4098:1: ( ( rule__MenuCategory__HasTableAssignment_2_0_0 ) )
             {
-            // InternalMenuDsl.g:3993:1: ( ( rule__MenuPackage__WidthAssignment_3_7_1 ) )
-            // InternalMenuDsl.g:3994:2: ( rule__MenuPackage__WidthAssignment_3_7_1 )
+            // InternalMenuDsl.g:4098:1: ( ( rule__MenuCategory__HasTableAssignment_2_0_0 ) )
+            // InternalMenuDsl.g:4099:2: ( rule__MenuCategory__HasTableAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_7_1()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasTableAssignment_2_0_0()); 
             }
-            // InternalMenuDsl.g:3995:2: ( rule__MenuPackage__WidthAssignment_3_7_1 )
-            // InternalMenuDsl.g:3995:3: rule__MenuPackage__WidthAssignment_3_7_1
+            // InternalMenuDsl.g:4100:2: ( rule__MenuCategory__HasTableAssignment_2_0_0 )
+            // InternalMenuDsl.g:4100:3: rule__MenuCategory__HasTableAssignment_2_0_0
             {
             pushFollow(FOLLOW_2);
-            rule__MenuPackage__WidthAssignment_3_7_1();
+            rule__MenuCategory__HasTableAssignment_2_0_0();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14688,7 +15070,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getWidthAssignment_3_7_1()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasTableAssignment_2_0_0()); 
             }
 
             }
@@ -14708,26 +15090,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__Group_3_7__1__Impl"
+    // $ANTLR end "rule__MenuCategory__Group_2_0__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__0"
-    // InternalMenuDsl.g:4004:1: rule__MenuEntry__Group__0 : rule__MenuEntry__Group__0__Impl rule__MenuEntry__Group__1 ;
-    public final void rule__MenuEntry__Group__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_0__1"
+    // InternalMenuDsl.g:4108:1: rule__MenuCategory__Group_2_0__1 : rule__MenuCategory__Group_2_0__1__Impl ;
+    public final void rule__MenuCategory__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4008:1: ( rule__MenuEntry__Group__0__Impl rule__MenuEntry__Group__1 )
-            // InternalMenuDsl.g:4009:2: rule__MenuEntry__Group__0__Impl rule__MenuEntry__Group__1
+            // InternalMenuDsl.g:4112:1: ( rule__MenuCategory__Group_2_0__1__Impl )
+            // InternalMenuDsl.g:4113:2: rule__MenuCategory__Group_2_0__1__Impl
             {
-            pushFollow(FOLLOW_14);
-            rule__MenuEntry__Group__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__1();
+            rule__MenuCategory__Group_2_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14746,32 +15123,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__0"
+    // $ANTLR end "rule__MenuCategory__Group_2_0__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__0__Impl"
-    // InternalMenuDsl.g:4016:1: rule__MenuEntry__Group__0__Impl : ( () ) ;
-    public final void rule__MenuEntry__Group__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_0__1__Impl"
+    // InternalMenuDsl.g:4119:1: rule__MenuCategory__Group_2_0__1__Impl : ( ( rule__MenuCategory__TableAssignment_2_0_1 ) ) ;
+    public final void rule__MenuCategory__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4020:1: ( ( () ) )
-            // InternalMenuDsl.g:4021:1: ( () )
+            // InternalMenuDsl.g:4123:1: ( ( ( rule__MenuCategory__TableAssignment_2_0_1 ) ) )
+            // InternalMenuDsl.g:4124:1: ( ( rule__MenuCategory__TableAssignment_2_0_1 ) )
             {
-            // InternalMenuDsl.g:4021:1: ( () )
-            // InternalMenuDsl.g:4022:2: ()
+            // InternalMenuDsl.g:4124:1: ( ( rule__MenuCategory__TableAssignment_2_0_1 ) )
+            // InternalMenuDsl.g:4125:2: ( rule__MenuCategory__TableAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getMenuEntryAction_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getTableAssignment_2_0_1()); 
             }
-            // InternalMenuDsl.g:4023:2: ()
-            // InternalMenuDsl.g:4023:3: 
+            // InternalMenuDsl.g:4126:2: ( rule__MenuCategory__TableAssignment_2_0_1 )
+            // InternalMenuDsl.g:4126:3: rule__MenuCategory__TableAssignment_2_0_1
             {
+            pushFollow(FOLLOW_2);
+            rule__MenuCategory__TableAssignment_2_0_1();
+
+            state._fsp--;
+            if (state.failed) return ;
+
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getMenuEntryAction_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getTableAssignment_2_0_1()); 
             }
 
             }
@@ -14780,6 +15163,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
         }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
         finally {
 
             	restoreStackSize(stackSize);
@@ -14787,26 +15174,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__0__Impl"
+    // $ANTLR end "rule__MenuCategory__Group_2_0__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__1"
-    // InternalMenuDsl.g:4031:1: rule__MenuEntry__Group__1 : rule__MenuEntry__Group__1__Impl rule__MenuEntry__Group__2 ;
-    public final void rule__MenuEntry__Group__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_1__0"
+    // InternalMenuDsl.g:4135:1: rule__MenuCategory__Group_2_1__0 : rule__MenuCategory__Group_2_1__0__Impl rule__MenuCategory__Group_2_1__1 ;
+    public final void rule__MenuCategory__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4035:1: ( rule__MenuEntry__Group__1__Impl rule__MenuEntry__Group__2 )
-            // InternalMenuDsl.g:4036:2: rule__MenuEntry__Group__1__Impl rule__MenuEntry__Group__2
+            // InternalMenuDsl.g:4139:1: ( rule__MenuCategory__Group_2_1__0__Impl rule__MenuCategory__Group_2_1__1 )
+            // InternalMenuDsl.g:4140:2: rule__MenuCategory__Group_2_1__0__Impl rule__MenuCategory__Group_2_1__1
             {
-            pushFollow(FOLLOW_7);
-            rule__MenuEntry__Group__1__Impl();
+            pushFollow(FOLLOW_6);
+            rule__MenuCategory__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__2();
+            rule__MenuCategory__Group_2_1__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14825,28 +15212,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__1"
+    // $ANTLR end "rule__MenuCategory__Group_2_1__0"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__1__Impl"
-    // InternalMenuDsl.g:4043:1: rule__MenuEntry__Group__1__Impl : ( 'entry' ) ;
-    public final void rule__MenuEntry__Group__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_1__0__Impl"
+    // InternalMenuDsl.g:4147:1: rule__MenuCategory__Group_2_1__0__Impl : ( ( rule__MenuCategory__HasDialogAssignment_2_1_0 ) ) ;
+    public final void rule__MenuCategory__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4047:1: ( ( 'entry' ) )
-            // InternalMenuDsl.g:4048:1: ( 'entry' )
+            // InternalMenuDsl.g:4151:1: ( ( ( rule__MenuCategory__HasDialogAssignment_2_1_0 ) ) )
+            // InternalMenuDsl.g:4152:1: ( ( rule__MenuCategory__HasDialogAssignment_2_1_0 ) )
             {
-            // InternalMenuDsl.g:4048:1: ( 'entry' )
-            // InternalMenuDsl.g:4049:2: 'entry'
+            // InternalMenuDsl.g:4152:1: ( ( rule__MenuCategory__HasDialogAssignment_2_1_0 ) )
+            // InternalMenuDsl.g:4153:2: ( rule__MenuCategory__HasDialogAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getEntryKeyword_1()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasDialogAssignment_2_1_0()); 
             }
-            match(input,58,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:4154:2: ( rule__MenuCategory__HasDialogAssignment_2_1_0 )
+            // InternalMenuDsl.g:4154:3: rule__MenuCategory__HasDialogAssignment_2_1_0
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuCategory__HasDialogAssignment_2_1_0();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getEntryKeyword_1()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasDialogAssignment_2_1_0()); 
             }
 
             }
@@ -14866,26 +15263,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__1__Impl"
+    // $ANTLR end "rule__MenuCategory__Group_2_1__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__2"
-    // InternalMenuDsl.g:4058:1: rule__MenuEntry__Group__2 : rule__MenuEntry__Group__2__Impl rule__MenuEntry__Group__3 ;
-    public final void rule__MenuEntry__Group__2() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_1__1"
+    // InternalMenuDsl.g:4162:1: rule__MenuCategory__Group_2_1__1 : rule__MenuCategory__Group_2_1__1__Impl ;
+    public final void rule__MenuCategory__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4062:1: ( rule__MenuEntry__Group__2__Impl rule__MenuEntry__Group__3 )
-            // InternalMenuDsl.g:4063:2: rule__MenuEntry__Group__2__Impl rule__MenuEntry__Group__3
+            // InternalMenuDsl.g:4166:1: ( rule__MenuCategory__Group_2_1__1__Impl )
+            // InternalMenuDsl.g:4167:2: rule__MenuCategory__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_15);
-            rule__MenuEntry__Group__2__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__3();
+            rule__MenuCategory__Group_2_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14904,30 +15296,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__2"
+    // $ANTLR end "rule__MenuCategory__Group_2_1__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__2__Impl"
-    // InternalMenuDsl.g:4070:1: rule__MenuEntry__Group__2__Impl : ( ( rule__MenuEntry__EntryidAssignment_2 ) ) ;
-    public final void rule__MenuEntry__Group__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_1__1__Impl"
+    // InternalMenuDsl.g:4173:1: rule__MenuCategory__Group_2_1__1__Impl : ( ( rule__MenuCategory__DialogAssignment_2_1_1 ) ) ;
+    public final void rule__MenuCategory__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4074:1: ( ( ( rule__MenuEntry__EntryidAssignment_2 ) ) )
-            // InternalMenuDsl.g:4075:1: ( ( rule__MenuEntry__EntryidAssignment_2 ) )
+            // InternalMenuDsl.g:4177:1: ( ( ( rule__MenuCategory__DialogAssignment_2_1_1 ) ) )
+            // InternalMenuDsl.g:4178:1: ( ( rule__MenuCategory__DialogAssignment_2_1_1 ) )
             {
-            // InternalMenuDsl.g:4075:1: ( ( rule__MenuEntry__EntryidAssignment_2 ) )
-            // InternalMenuDsl.g:4076:2: ( rule__MenuEntry__EntryidAssignment_2 )
+            // InternalMenuDsl.g:4178:1: ( ( rule__MenuCategory__DialogAssignment_2_1_1 ) )
+            // InternalMenuDsl.g:4179:2: ( rule__MenuCategory__DialogAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getEntryidAssignment_2()); 
+               before(grammarAccess.getMenuCategoryAccess().getDialogAssignment_2_1_1()); 
             }
-            // InternalMenuDsl.g:4077:2: ( rule__MenuEntry__EntryidAssignment_2 )
-            // InternalMenuDsl.g:4077:3: rule__MenuEntry__EntryidAssignment_2
+            // InternalMenuDsl.g:4180:2: ( rule__MenuCategory__DialogAssignment_2_1_1 )
+            // InternalMenuDsl.g:4180:3: rule__MenuCategory__DialogAssignment_2_1_1
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__EntryidAssignment_2();
+            rule__MenuCategory__DialogAssignment_2_1_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14935,7 +15327,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getEntryidAssignment_2()); 
+               after(grammarAccess.getMenuCategoryAccess().getDialogAssignment_2_1_1()); 
             }
 
             }
@@ -14955,26 +15347,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__2__Impl"
+    // $ANTLR end "rule__MenuCategory__Group_2_1__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__3"
-    // InternalMenuDsl.g:4085:1: rule__MenuEntry__Group__3 : rule__MenuEntry__Group__3__Impl rule__MenuEntry__Group__4 ;
-    public final void rule__MenuEntry__Group__3() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_6__0"
+    // InternalMenuDsl.g:4189:1: rule__MenuCategory__Group_2_6__0 : rule__MenuCategory__Group_2_6__0__Impl rule__MenuCategory__Group_2_6__1 ;
+    public final void rule__MenuCategory__Group_2_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4089:1: ( rule__MenuEntry__Group__3__Impl rule__MenuEntry__Group__4 )
-            // InternalMenuDsl.g:4090:2: rule__MenuEntry__Group__3__Impl rule__MenuEntry__Group__4
+            // InternalMenuDsl.g:4193:1: ( rule__MenuCategory__Group_2_6__0__Impl rule__MenuCategory__Group_2_6__1 )
+            // InternalMenuDsl.g:4194:2: rule__MenuCategory__Group_2_6__0__Impl rule__MenuCategory__Group_2_6__1
             {
-            pushFollow(FOLLOW_15);
-            rule__MenuEntry__Group__3__Impl();
+            pushFollow(FOLLOW_13);
+            rule__MenuCategory__Group_2_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__4();
+            rule__MenuCategory__Group_2_6__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -14993,49 +15385,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__3"
+    // $ANTLR end "rule__MenuCategory__Group_2_6__0"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__3__Impl"
-    // InternalMenuDsl.g:4097:1: rule__MenuEntry__Group__3__Impl : ( ( rule__MenuEntry__Group_3__0 )? ) ;
-    public final void rule__MenuEntry__Group__3__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_6__0__Impl"
+    // InternalMenuDsl.g:4201:1: rule__MenuCategory__Group_2_6__0__Impl : ( '{' ) ;
+    public final void rule__MenuCategory__Group_2_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4101:1: ( ( ( rule__MenuEntry__Group_3__0 )? ) )
-            // InternalMenuDsl.g:4102:1: ( ( rule__MenuEntry__Group_3__0 )? )
+            // InternalMenuDsl.g:4205:1: ( ( '{' ) )
+            // InternalMenuDsl.g:4206:1: ( '{' )
             {
-            // InternalMenuDsl.g:4102:1: ( ( rule__MenuEntry__Group_3__0 )? )
-            // InternalMenuDsl.g:4103:2: ( rule__MenuEntry__Group_3__0 )?
+            // InternalMenuDsl.g:4206:1: ( '{' )
+            // InternalMenuDsl.g:4207:2: '{'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getGroup_3()); 
+               before(grammarAccess.getMenuCategoryAccess().getLeftCurlyBracketKeyword_2_6_0()); 
             }
-            // InternalMenuDsl.g:4104:2: ( rule__MenuEntry__Group_3__0 )?
-            int alt55=2;
-            int LA55_0 = input.LA(1);
-
-            if ( (LA55_0==91) ) {
-                alt55=1;
-            }
-            switch (alt55) {
-                case 1 :
-                    // InternalMenuDsl.g:4104:3: rule__MenuEntry__Group_3__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Group_3__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getGroup_3()); 
+               after(grammarAccess.getMenuCategoryAccess().getLeftCurlyBracketKeyword_2_6_0()); 
             }
 
             }
@@ -15055,26 +15426,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__3__Impl"
+    // $ANTLR end "rule__MenuCategory__Group_2_6__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__4"
-    // InternalMenuDsl.g:4112:1: rule__MenuEntry__Group__4 : rule__MenuEntry__Group__4__Impl rule__MenuEntry__Group__5 ;
-    public final void rule__MenuEntry__Group__4() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_6__1"
+    // InternalMenuDsl.g:4216:1: rule__MenuCategory__Group_2_6__1 : rule__MenuCategory__Group_2_6__1__Impl rule__MenuCategory__Group_2_6__2 ;
+    public final void rule__MenuCategory__Group_2_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4116:1: ( rule__MenuEntry__Group__4__Impl rule__MenuEntry__Group__5 )
-            // InternalMenuDsl.g:4117:2: rule__MenuEntry__Group__4__Impl rule__MenuEntry__Group__5
+            // InternalMenuDsl.g:4220:1: ( rule__MenuCategory__Group_2_6__1__Impl rule__MenuCategory__Group_2_6__2 )
+            // InternalMenuDsl.g:4221:2: rule__MenuCategory__Group_2_6__1__Impl rule__MenuCategory__Group_2_6__2
             {
-            pushFollow(FOLLOW_15);
-            rule__MenuEntry__Group__4__Impl();
+            pushFollow(FOLLOW_13);
+            rule__MenuCategory__Group_2_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__5();
+            rule__MenuCategory__Group_2_6__2();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15093,49 +15464,56 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__4"
+    // $ANTLR end "rule__MenuCategory__Group_2_6__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__4__Impl"
-    // InternalMenuDsl.g:4124:1: rule__MenuEntry__Group__4__Impl : ( ( rule__MenuEntry__Group_4__0 )? ) ;
-    public final void rule__MenuEntry__Group__4__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_6__1__Impl"
+    // InternalMenuDsl.g:4228:1: rule__MenuCategory__Group_2_6__1__Impl : ( ( rule__MenuCategory__TreesAssignment_2_6_1 )* ) ;
+    public final void rule__MenuCategory__Group_2_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4128:1: ( ( ( rule__MenuEntry__Group_4__0 )? ) )
-            // InternalMenuDsl.g:4129:1: ( ( rule__MenuEntry__Group_4__0 )? )
+            // InternalMenuDsl.g:4232:1: ( ( ( rule__MenuCategory__TreesAssignment_2_6_1 )* ) )
+            // InternalMenuDsl.g:4233:1: ( ( rule__MenuCategory__TreesAssignment_2_6_1 )* )
             {
-            // InternalMenuDsl.g:4129:1: ( ( rule__MenuEntry__Group_4__0 )? )
-            // InternalMenuDsl.g:4130:2: ( rule__MenuEntry__Group_4__0 )?
+            // InternalMenuDsl.g:4233:1: ( ( rule__MenuCategory__TreesAssignment_2_6_1 )* )
+            // InternalMenuDsl.g:4234:2: ( rule__MenuCategory__TreesAssignment_2_6_1 )*
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getGroup_4()); 
+               before(grammarAccess.getMenuCategoryAccess().getTreesAssignment_2_6_1()); 
             }
-            // InternalMenuDsl.g:4131:2: ( rule__MenuEntry__Group_4__0 )?
-            int alt56=2;
-            int LA56_0 = input.LA(1);
+            // InternalMenuDsl.g:4235:2: ( rule__MenuCategory__TreesAssignment_2_6_1 )*
+            loop55:
+            do {
+                int alt55=2;
+                int LA55_0 = input.LA(1);
 
-            if ( (LA56_0==92) ) {
-                alt56=1;
-            }
-            switch (alt56) {
-                case 1 :
-                    // InternalMenuDsl.g:4131:3: rule__MenuEntry__Group_4__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Group_4__0();
+                if ( (LA55_0==59) ) {
+                    alt55=1;
+                }
 
-                    state._fsp--;
-                    if (state.failed) return ;
 
-                    }
-                    break;
+                switch (alt55) {
+            	case 1 :
+            	    // InternalMenuDsl.g:4235:3: rule__MenuCategory__TreesAssignment_2_6_1
+            	    {
+            	    pushFollow(FOLLOW_14);
+            	    rule__MenuCategory__TreesAssignment_2_6_1();
 
-            }
+            	    state._fsp--;
+            	    if (state.failed) return ;
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop55;
+                }
+            } while (true);
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getGroup_4()); 
+               after(grammarAccess.getMenuCategoryAccess().getTreesAssignment_2_6_1()); 
             }
 
             }
@@ -15155,26 +15533,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__4__Impl"
+    // $ANTLR end "rule__MenuCategory__Group_2_6__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__5"
-    // InternalMenuDsl.g:4139:1: rule__MenuEntry__Group__5 : rule__MenuEntry__Group__5__Impl rule__MenuEntry__Group__6 ;
-    public final void rule__MenuEntry__Group__5() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_6__2"
+    // InternalMenuDsl.g:4243:1: rule__MenuCategory__Group_2_6__2 : rule__MenuCategory__Group_2_6__2__Impl ;
+    public final void rule__MenuCategory__Group_2_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4143:1: ( rule__MenuEntry__Group__5__Impl rule__MenuEntry__Group__6 )
-            // InternalMenuDsl.g:4144:2: rule__MenuEntry__Group__5__Impl rule__MenuEntry__Group__6
+            // InternalMenuDsl.g:4247:1: ( rule__MenuCategory__Group_2_6__2__Impl )
+            // InternalMenuDsl.g:4248:2: rule__MenuCategory__Group_2_6__2__Impl
             {
-            pushFollow(FOLLOW_15);
-            rule__MenuEntry__Group__5__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__6();
+            rule__MenuCategory__Group_2_6__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15193,49 +15566,107 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__5"
+    // $ANTLR end "rule__MenuCategory__Group_2_6__2"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__5__Impl"
-    // InternalMenuDsl.g:4151:1: rule__MenuEntry__Group__5__Impl : ( ( rule__MenuEntry__ShowBadgeAssignment_5 )? ) ;
-    public final void rule__MenuEntry__Group__5__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__Group_2_6__2__Impl"
+    // InternalMenuDsl.g:4254:1: rule__MenuCategory__Group_2_6__2__Impl : ( '}' ) ;
+    public final void rule__MenuCategory__Group_2_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4155:1: ( ( ( rule__MenuEntry__ShowBadgeAssignment_5 )? ) )
-            // InternalMenuDsl.g:4156:1: ( ( rule__MenuEntry__ShowBadgeAssignment_5 )? )
+            // InternalMenuDsl.g:4258:1: ( ( '}' ) )
+            // InternalMenuDsl.g:4259:1: ( '}' )
             {
-            // InternalMenuDsl.g:4156:1: ( ( rule__MenuEntry__ShowBadgeAssignment_5 )? )
-            // InternalMenuDsl.g:4157:2: ( rule__MenuEntry__ShowBadgeAssignment_5 )?
+            // InternalMenuDsl.g:4259:1: ( '}' )
+            // InternalMenuDsl.g:4260:2: '}'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getShowBadgeAssignment_5()); 
+               before(grammarAccess.getMenuCategoryAccess().getRightCurlyBracketKeyword_2_6_2()); 
+            }
+            match(input,58,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuCategoryAccess().getRightCurlyBracketKeyword_2_6_2()); 
             }
-            // InternalMenuDsl.g:4158:2: ( rule__MenuEntry__ShowBadgeAssignment_5 )?
-            int alt57=2;
-            int LA57_0 = input.LA(1);
 
-            if ( (LA57_0==93) ) {
-                alt57=1;
             }
-            switch (alt57) {
-                case 1 :
-                    // InternalMenuDsl.g:4158:3: rule__MenuEntry__ShowBadgeAssignment_5
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__MenuEntry__ShowBadgeAssignment_5();
 
-                    state._fsp--;
-                    if (state.failed) return ;
 
-                    }
-                    break;
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuCategory__Group_2_6__2__Impl"
+
+
+    // $ANTLR start "rule__MenuTree__Group__0"
+    // InternalMenuDsl.g:4270:1: rule__MenuTree__Group__0 : rule__MenuTree__Group__0__Impl rule__MenuTree__Group__1 ;
+    public final void rule__MenuTree__Group__0() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:4274:1: ( rule__MenuTree__Group__0__Impl rule__MenuTree__Group__1 )
+            // InternalMenuDsl.g:4275:2: rule__MenuTree__Group__0__Impl rule__MenuTree__Group__1
+            {
+            pushFollow(FOLLOW_6);
+            rule__MenuTree__Group__0__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
+            pushFollow(FOLLOW_2);
+            rule__MenuTree__Group__1();
+
+            state._fsp--;
+            if (state.failed) return ;
 
             }
 
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuTree__Group__0"
+
+
+    // $ANTLR start "rule__MenuTree__Group__0__Impl"
+    // InternalMenuDsl.g:4282:1: rule__MenuTree__Group__0__Impl : ( 'tree' ) ;
+    public final void rule__MenuTree__Group__0__Impl() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:4286:1: ( ( 'tree' ) )
+            // InternalMenuDsl.g:4287:1: ( 'tree' )
+            {
+            // InternalMenuDsl.g:4287:1: ( 'tree' )
+            // InternalMenuDsl.g:4288:2: 'tree'
+            {
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getShowBadgeAssignment_5()); 
+               before(grammarAccess.getMenuTreeAccess().getTreeKeyword_0()); 
+            }
+            match(input,59,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuTreeAccess().getTreeKeyword_0()); 
             }
 
             }
@@ -15255,26 +15686,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__5__Impl"
+    // $ANTLR end "rule__MenuTree__Group__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__6"
-    // InternalMenuDsl.g:4166:1: rule__MenuEntry__Group__6 : rule__MenuEntry__Group__6__Impl rule__MenuEntry__Group__7 ;
-    public final void rule__MenuEntry__Group__6() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__1"
+    // InternalMenuDsl.g:4297:1: rule__MenuTree__Group__1 : rule__MenuTree__Group__1__Impl rule__MenuTree__Group__2 ;
+    public final void rule__MenuTree__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4170:1: ( rule__MenuEntry__Group__6__Impl rule__MenuEntry__Group__7 )
-            // InternalMenuDsl.g:4171:2: rule__MenuEntry__Group__6__Impl rule__MenuEntry__Group__7
+            // InternalMenuDsl.g:4301:1: ( rule__MenuTree__Group__1__Impl rule__MenuTree__Group__2 )
+            // InternalMenuDsl.g:4302:2: rule__MenuTree__Group__1__Impl rule__MenuTree__Group__2
             {
             pushFollow(FOLLOW_15);
-            rule__MenuEntry__Group__6__Impl();
+            rule__MenuTree__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__7();
+            rule__MenuTree__Group__2();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15293,49 +15724,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__6"
+    // $ANTLR end "rule__MenuTree__Group__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__6__Impl"
-    // InternalMenuDsl.g:4178:1: rule__MenuEntry__Group__6__Impl : ( ( rule__MenuEntry__Alternatives_6 )? ) ;
-    public final void rule__MenuEntry__Group__6__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__1__Impl"
+    // InternalMenuDsl.g:4309:1: rule__MenuTree__Group__1__Impl : ( ( rule__MenuTree__NameAssignment_1 ) ) ;
+    public final void rule__MenuTree__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4182:1: ( ( ( rule__MenuEntry__Alternatives_6 )? ) )
-            // InternalMenuDsl.g:4183:1: ( ( rule__MenuEntry__Alternatives_6 )? )
+            // InternalMenuDsl.g:4313:1: ( ( ( rule__MenuTree__NameAssignment_1 ) ) )
+            // InternalMenuDsl.g:4314:1: ( ( rule__MenuTree__NameAssignment_1 ) )
             {
-            // InternalMenuDsl.g:4183:1: ( ( rule__MenuEntry__Alternatives_6 )? )
-            // InternalMenuDsl.g:4184:2: ( rule__MenuEntry__Alternatives_6 )?
+            // InternalMenuDsl.g:4314:1: ( ( rule__MenuTree__NameAssignment_1 ) )
+            // InternalMenuDsl.g:4315:2: ( rule__MenuTree__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getAlternatives_6()); 
-            }
-            // InternalMenuDsl.g:4185:2: ( rule__MenuEntry__Alternatives_6 )?
-            int alt58=2;
-            int LA58_0 = input.LA(1);
-
-            if ( ((LA58_0>=94 && LA58_0<=99)) ) {
-                alt58=1;
+               before(grammarAccess.getMenuTreeAccess().getNameAssignment_1()); 
             }
-            switch (alt58) {
-                case 1 :
-                    // InternalMenuDsl.g:4185:3: rule__MenuEntry__Alternatives_6
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Alternatives_6();
-
-                    state._fsp--;
-                    if (state.failed) return ;
+            // InternalMenuDsl.g:4316:2: ( rule__MenuTree__NameAssignment_1 )
+            // InternalMenuDsl.g:4316:3: rule__MenuTree__NameAssignment_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuTree__NameAssignment_1();
 
-                    }
-                    break;
+            state._fsp--;
+            if (state.failed) return ;
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getAlternatives_6()); 
+               after(grammarAccess.getMenuTreeAccess().getNameAssignment_1()); 
             }
 
             }
@@ -15355,21 +15775,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__6__Impl"
+    // $ANTLR end "rule__MenuTree__Group__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__7"
-    // InternalMenuDsl.g:4193:1: rule__MenuEntry__Group__7 : rule__MenuEntry__Group__7__Impl ;
-    public final void rule__MenuEntry__Group__7() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__2"
+    // InternalMenuDsl.g:4324:1: rule__MenuTree__Group__2 : rule__MenuTree__Group__2__Impl rule__MenuTree__Group__3 ;
+    public final void rule__MenuTree__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4197:1: ( rule__MenuEntry__Group__7__Impl )
-            // InternalMenuDsl.g:4198:2: rule__MenuEntry__Group__7__Impl
+            // InternalMenuDsl.g:4328:1: ( rule__MenuTree__Group__2__Impl rule__MenuTree__Group__3 )
+            // InternalMenuDsl.g:4329:2: rule__MenuTree__Group__2__Impl rule__MenuTree__Group__3
             {
+            pushFollow(FOLLOW_15);
+            rule__MenuTree__Group__2__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group__7__Impl();
+            rule__MenuTree__Group__3();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15388,38 +15813,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__7"
+    // $ANTLR end "rule__MenuTree__Group__2"
 
 
-    // $ANTLR start "rule__MenuEntry__Group__7__Impl"
-    // InternalMenuDsl.g:4204:1: rule__MenuEntry__Group__7__Impl : ( ( rule__MenuEntry__Group_7__0 )? ) ;
-    public final void rule__MenuEntry__Group__7__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__2__Impl"
+    // InternalMenuDsl.g:4336:1: rule__MenuTree__Group__2__Impl : ( ( rule__MenuTree__Group_2__0 )? ) ;
+    public final void rule__MenuTree__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4208:1: ( ( ( rule__MenuEntry__Group_7__0 )? ) )
-            // InternalMenuDsl.g:4209:1: ( ( rule__MenuEntry__Group_7__0 )? )
+            // InternalMenuDsl.g:4340:1: ( ( ( rule__MenuTree__Group_2__0 )? ) )
+            // InternalMenuDsl.g:4341:1: ( ( rule__MenuTree__Group_2__0 )? )
             {
-            // InternalMenuDsl.g:4209:1: ( ( rule__MenuEntry__Group_7__0 )? )
-            // InternalMenuDsl.g:4210:2: ( rule__MenuEntry__Group_7__0 )?
+            // InternalMenuDsl.g:4341:1: ( ( rule__MenuTree__Group_2__0 )? )
+            // InternalMenuDsl.g:4342:2: ( rule__MenuTree__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getGroup_7()); 
+               before(grammarAccess.getMenuTreeAccess().getGroup_2()); 
             }
-            // InternalMenuDsl.g:4211:2: ( rule__MenuEntry__Group_7__0 )?
-            int alt59=2;
-            int LA59_0 = input.LA(1);
+            // InternalMenuDsl.g:4343:2: ( rule__MenuTree__Group_2__0 )?
+            int alt56=2;
+            int LA56_0 = input.LA(1);
 
-            if ( (LA59_0==52) ) {
-                alt59=1;
+            if ( (LA56_0==98) ) {
+                alt56=1;
             }
-            switch (alt59) {
+            switch (alt56) {
                 case 1 :
-                    // InternalMenuDsl.g:4211:3: rule__MenuEntry__Group_7__0
+                    // InternalMenuDsl.g:4343:3: rule__MenuTree__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__MenuEntry__Group_7__0();
+                    rule__MenuTree__Group_2__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -15430,7 +15855,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getGroup_7()); 
+               after(grammarAccess.getMenuTreeAccess().getGroup_2()); 
             }
 
             }
@@ -15450,26 +15875,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group__7__Impl"
+    // $ANTLR end "rule__MenuTree__Group__2__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_3__0"
-    // InternalMenuDsl.g:4220:1: rule__MenuEntry__Group_3__0 : rule__MenuEntry__Group_3__0__Impl rule__MenuEntry__Group_3__1 ;
-    public final void rule__MenuEntry__Group_3__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__3"
+    // InternalMenuDsl.g:4351:1: rule__MenuTree__Group__3 : rule__MenuTree__Group__3__Impl rule__MenuTree__Group__4 ;
+    public final void rule__MenuTree__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4224:1: ( rule__MenuEntry__Group_3__0__Impl rule__MenuEntry__Group_3__1 )
-            // InternalMenuDsl.g:4225:2: rule__MenuEntry__Group_3__0__Impl rule__MenuEntry__Group_3__1
+            // InternalMenuDsl.g:4355:1: ( rule__MenuTree__Group__3__Impl rule__MenuTree__Group__4 )
+            // InternalMenuDsl.g:4356:2: rule__MenuTree__Group__3__Impl rule__MenuTree__Group__4
             {
-            pushFollow(FOLLOW_10);
-            rule__MenuEntry__Group_3__0__Impl();
+            pushFollow(FOLLOW_16);
+            rule__MenuTree__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_3__1();
+            rule__MenuTree__Group__4();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15488,38 +15913,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_3__0"
+    // $ANTLR end "rule__MenuTree__Group__3"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_3__0__Impl"
-    // InternalMenuDsl.g:4232:1: rule__MenuEntry__Group_3__0__Impl : ( ( rule__MenuEntry__DescriptionAssignment_3_0 ) ) ;
-    public final void rule__MenuEntry__Group_3__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__3__Impl"
+    // InternalMenuDsl.g:4363:1: rule__MenuTree__Group__3__Impl : ( '{' ) ;
+    public final void rule__MenuTree__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4236:1: ( ( ( rule__MenuEntry__DescriptionAssignment_3_0 ) ) )
-            // InternalMenuDsl.g:4237:1: ( ( rule__MenuEntry__DescriptionAssignment_3_0 ) )
+            // InternalMenuDsl.g:4367:1: ( ( '{' ) )
+            // InternalMenuDsl.g:4368:1: ( '{' )
             {
-            // InternalMenuDsl.g:4237:1: ( ( rule__MenuEntry__DescriptionAssignment_3_0 ) )
-            // InternalMenuDsl.g:4238:2: ( rule__MenuEntry__DescriptionAssignment_3_0 )
+            // InternalMenuDsl.g:4368:1: ( '{' )
+            // InternalMenuDsl.g:4369:2: '{'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDescriptionAssignment_3_0()); 
+               before(grammarAccess.getMenuTreeAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            // InternalMenuDsl.g:4239:2: ( rule__MenuEntry__DescriptionAssignment_3_0 )
-            // InternalMenuDsl.g:4239:3: rule__MenuEntry__DescriptionAssignment_3_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__MenuEntry__DescriptionAssignment_3_0();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDescriptionAssignment_3_0()); 
+               after(grammarAccess.getMenuTreeAccess().getLeftCurlyBracketKeyword_3()); 
             }
 
             }
@@ -15539,21 +15954,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_3__0__Impl"
+    // $ANTLR end "rule__MenuTree__Group__3__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_3__1"
-    // InternalMenuDsl.g:4247:1: rule__MenuEntry__Group_3__1 : rule__MenuEntry__Group_3__1__Impl ;
-    public final void rule__MenuEntry__Group_3__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__4"
+    // InternalMenuDsl.g:4378:1: rule__MenuTree__Group__4 : rule__MenuTree__Group__4__Impl rule__MenuTree__Group__5 ;
+    public final void rule__MenuTree__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4251:1: ( rule__MenuEntry__Group_3__1__Impl )
-            // InternalMenuDsl.g:4252:2: rule__MenuEntry__Group_3__1__Impl
+            // InternalMenuDsl.g:4382:1: ( rule__MenuTree__Group__4__Impl rule__MenuTree__Group__5 )
+            // InternalMenuDsl.g:4383:2: rule__MenuTree__Group__4__Impl rule__MenuTree__Group__5
             {
+            pushFollow(FOLLOW_16);
+            rule__MenuTree__Group__4__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_3__1__Impl();
+            rule__MenuTree__Group__5();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15572,38 +15992,56 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_3__1"
+    // $ANTLR end "rule__MenuTree__Group__4"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_3__1__Impl"
-    // InternalMenuDsl.g:4258:1: rule__MenuEntry__Group_3__1__Impl : ( ( rule__MenuEntry__DescriptionValueAssignment_3_1 ) ) ;
-    public final void rule__MenuEntry__Group_3__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__4__Impl"
+    // InternalMenuDsl.g:4390:1: rule__MenuTree__Group__4__Impl : ( ( rule__MenuTree__EntriesAssignment_4 )* ) ;
+    public final void rule__MenuTree__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4262:1: ( ( ( rule__MenuEntry__DescriptionValueAssignment_3_1 ) ) )
-            // InternalMenuDsl.g:4263:1: ( ( rule__MenuEntry__DescriptionValueAssignment_3_1 ) )
+            // InternalMenuDsl.g:4394:1: ( ( ( rule__MenuTree__EntriesAssignment_4 )* ) )
+            // InternalMenuDsl.g:4395:1: ( ( rule__MenuTree__EntriesAssignment_4 )* )
             {
-            // InternalMenuDsl.g:4263:1: ( ( rule__MenuEntry__DescriptionValueAssignment_3_1 ) )
-            // InternalMenuDsl.g:4264:2: ( rule__MenuEntry__DescriptionValueAssignment_3_1 )
+            // InternalMenuDsl.g:4395:1: ( ( rule__MenuTree__EntriesAssignment_4 )* )
+            // InternalMenuDsl.g:4396:2: ( rule__MenuTree__EntriesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDescriptionValueAssignment_3_1()); 
+               before(grammarAccess.getMenuTreeAccess().getEntriesAssignment_4()); 
             }
-            // InternalMenuDsl.g:4265:2: ( rule__MenuEntry__DescriptionValueAssignment_3_1 )
-            // InternalMenuDsl.g:4265:3: rule__MenuEntry__DescriptionValueAssignment_3_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__MenuEntry__DescriptionValueAssignment_3_1();
+            // InternalMenuDsl.g:4397:2: ( rule__MenuTree__EntriesAssignment_4 )*
+            loop57:
+            do {
+                int alt57=2;
+                int LA57_0 = input.LA(1);
 
-            state._fsp--;
-            if (state.failed) return ;
+                if ( (LA57_0==60) ) {
+                    alt57=1;
+                }
 
-            }
+
+                switch (alt57) {
+            	case 1 :
+            	    // InternalMenuDsl.g:4397:3: rule__MenuTree__EntriesAssignment_4
+            	    {
+            	    pushFollow(FOLLOW_17);
+            	    rule__MenuTree__EntriesAssignment_4();
+
+            	    state._fsp--;
+            	    if (state.failed) return ;
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop57;
+                }
+            } while (true);
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDescriptionValueAssignment_3_1()); 
+               after(grammarAccess.getMenuTreeAccess().getEntriesAssignment_4()); 
             }
 
             }
@@ -15623,26 +16061,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_3__1__Impl"
+    // $ANTLR end "rule__MenuTree__Group__4__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_4__0"
-    // InternalMenuDsl.g:4274:1: rule__MenuEntry__Group_4__0 : rule__MenuEntry__Group_4__0__Impl rule__MenuEntry__Group_4__1 ;
-    public final void rule__MenuEntry__Group_4__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__5"
+    // InternalMenuDsl.g:4405:1: rule__MenuTree__Group__5 : rule__MenuTree__Group__5__Impl ;
+    public final void rule__MenuTree__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4278:1: ( rule__MenuEntry__Group_4__0__Impl rule__MenuEntry__Group_4__1 )
-            // InternalMenuDsl.g:4279:2: rule__MenuEntry__Group_4__0__Impl rule__MenuEntry__Group_4__1
+            // InternalMenuDsl.g:4409:1: ( rule__MenuTree__Group__5__Impl )
+            // InternalMenuDsl.g:4410:2: rule__MenuTree__Group__5__Impl
             {
-            pushFollow(FOLLOW_10);
-            rule__MenuEntry__Group_4__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_4__1();
+            rule__MenuTree__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15661,38 +16094,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_4__0"
+    // $ANTLR end "rule__MenuTree__Group__5"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_4__0__Impl"
-    // InternalMenuDsl.g:4286:1: rule__MenuEntry__Group_4__0__Impl : ( ( rule__MenuEntry__HasImageAssignment_4_0 ) ) ;
-    public final void rule__MenuEntry__Group_4__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group__5__Impl"
+    // InternalMenuDsl.g:4416:1: rule__MenuTree__Group__5__Impl : ( '}' ) ;
+    public final void rule__MenuTree__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4290:1: ( ( ( rule__MenuEntry__HasImageAssignment_4_0 ) ) )
-            // InternalMenuDsl.g:4291:1: ( ( rule__MenuEntry__HasImageAssignment_4_0 ) )
+            // InternalMenuDsl.g:4420:1: ( ( '}' ) )
+            // InternalMenuDsl.g:4421:1: ( '}' )
             {
-            // InternalMenuDsl.g:4291:1: ( ( rule__MenuEntry__HasImageAssignment_4_0 ) )
-            // InternalMenuDsl.g:4292:2: ( rule__MenuEntry__HasImageAssignment_4_0 )
+            // InternalMenuDsl.g:4421:1: ( '}' )
+            // InternalMenuDsl.g:4422:2: '}'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasImageAssignment_4_0()); 
+               before(grammarAccess.getMenuTreeAccess().getRightCurlyBracketKeyword_5()); 
             }
-            // InternalMenuDsl.g:4293:2: ( rule__MenuEntry__HasImageAssignment_4_0 )
-            // InternalMenuDsl.g:4293:3: rule__MenuEntry__HasImageAssignment_4_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__MenuEntry__HasImageAssignment_4_0();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasImageAssignment_4_0()); 
+               after(grammarAccess.getMenuTreeAccess().getRightCurlyBracketKeyword_5()); 
             }
 
             }
@@ -15712,21 +16135,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_4__0__Impl"
+    // $ANTLR end "rule__MenuTree__Group__5__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_4__1"
-    // InternalMenuDsl.g:4301:1: rule__MenuEntry__Group_4__1 : rule__MenuEntry__Group_4__1__Impl ;
-    public final void rule__MenuEntry__Group_4__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group_2__0"
+    // InternalMenuDsl.g:4432:1: rule__MenuTree__Group_2__0 : rule__MenuTree__Group_2__0__Impl rule__MenuTree__Group_2__1 ;
+    public final void rule__MenuTree__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4305:1: ( rule__MenuEntry__Group_4__1__Impl )
-            // InternalMenuDsl.g:4306:2: rule__MenuEntry__Group_4__1__Impl
+            // InternalMenuDsl.g:4436:1: ( rule__MenuTree__Group_2__0__Impl rule__MenuTree__Group_2__1 )
+            // InternalMenuDsl.g:4437:2: rule__MenuTree__Group_2__0__Impl rule__MenuTree__Group_2__1
             {
+            pushFollow(FOLLOW_8);
+            rule__MenuTree__Group_2__0__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_4__1__Impl();
+            rule__MenuTree__Group_2__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15745,30 +16173,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_4__1"
+    // $ANTLR end "rule__MenuTree__Group_2__0"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_4__1__Impl"
-    // InternalMenuDsl.g:4312:1: rule__MenuEntry__Group_4__1__Impl : ( ( rule__MenuEntry__ImageAssignment_4_1 ) ) ;
-    public final void rule__MenuEntry__Group_4__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group_2__0__Impl"
+    // InternalMenuDsl.g:4444:1: rule__MenuTree__Group_2__0__Impl : ( ( rule__MenuTree__HasTooltipAssignment_2_0 ) ) ;
+    public final void rule__MenuTree__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4316:1: ( ( ( rule__MenuEntry__ImageAssignment_4_1 ) ) )
-            // InternalMenuDsl.g:4317:1: ( ( rule__MenuEntry__ImageAssignment_4_1 ) )
+            // InternalMenuDsl.g:4448:1: ( ( ( rule__MenuTree__HasTooltipAssignment_2_0 ) ) )
+            // InternalMenuDsl.g:4449:1: ( ( rule__MenuTree__HasTooltipAssignment_2_0 ) )
             {
-            // InternalMenuDsl.g:4317:1: ( ( rule__MenuEntry__ImageAssignment_4_1 ) )
-            // InternalMenuDsl.g:4318:2: ( rule__MenuEntry__ImageAssignment_4_1 )
+            // InternalMenuDsl.g:4449:1: ( ( rule__MenuTree__HasTooltipAssignment_2_0 ) )
+            // InternalMenuDsl.g:4450:2: ( rule__MenuTree__HasTooltipAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getImageAssignment_4_1()); 
+               before(grammarAccess.getMenuTreeAccess().getHasTooltipAssignment_2_0()); 
             }
-            // InternalMenuDsl.g:4319:2: ( rule__MenuEntry__ImageAssignment_4_1 )
-            // InternalMenuDsl.g:4319:3: rule__MenuEntry__ImageAssignment_4_1
+            // InternalMenuDsl.g:4451:2: ( rule__MenuTree__HasTooltipAssignment_2_0 )
+            // InternalMenuDsl.g:4451:3: rule__MenuTree__HasTooltipAssignment_2_0
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__ImageAssignment_4_1();
+            rule__MenuTree__HasTooltipAssignment_2_0();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15776,7 +16204,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getImageAssignment_4_1()); 
+               after(grammarAccess.getMenuTreeAccess().getHasTooltipAssignment_2_0()); 
             }
 
             }
@@ -15796,26 +16224,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_4__1__Impl"
+    // $ANTLR end "rule__MenuTree__Group_2__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_0__0"
-    // InternalMenuDsl.g:4328:1: rule__MenuEntry__Group_6_0__0 : rule__MenuEntry__Group_6_0__0__Impl rule__MenuEntry__Group_6_0__1 ;
-    public final void rule__MenuEntry__Group_6_0__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group_2__1"
+    // InternalMenuDsl.g:4459:1: rule__MenuTree__Group_2__1 : rule__MenuTree__Group_2__1__Impl ;
+    public final void rule__MenuTree__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4332:1: ( rule__MenuEntry__Group_6_0__0__Impl rule__MenuEntry__Group_6_0__1 )
-            // InternalMenuDsl.g:4333:2: rule__MenuEntry__Group_6_0__0__Impl rule__MenuEntry__Group_6_0__1
+            // InternalMenuDsl.g:4463:1: ( rule__MenuTree__Group_2__1__Impl )
+            // InternalMenuDsl.g:4464:2: rule__MenuTree__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_7);
-            rule__MenuEntry__Group_6_0__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_0__1();
+            rule__MenuTree__Group_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15834,30 +16257,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_0__0"
+    // $ANTLR end "rule__MenuTree__Group_2__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_0__0__Impl"
-    // InternalMenuDsl.g:4340:1: rule__MenuEntry__Group_6_0__0__Impl : ( ( rule__MenuEntry__HasProcessAssignment_6_0_0 ) ) ;
-    public final void rule__MenuEntry__Group_6_0__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__Group_2__1__Impl"
+    // InternalMenuDsl.g:4470:1: rule__MenuTree__Group_2__1__Impl : ( ( rule__MenuTree__TooltipAssignment_2_1 ) ) ;
+    public final void rule__MenuTree__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4344:1: ( ( ( rule__MenuEntry__HasProcessAssignment_6_0_0 ) ) )
-            // InternalMenuDsl.g:4345:1: ( ( rule__MenuEntry__HasProcessAssignment_6_0_0 ) )
+            // InternalMenuDsl.g:4474:1: ( ( ( rule__MenuTree__TooltipAssignment_2_1 ) ) )
+            // InternalMenuDsl.g:4475:1: ( ( rule__MenuTree__TooltipAssignment_2_1 ) )
             {
-            // InternalMenuDsl.g:4345:1: ( ( rule__MenuEntry__HasProcessAssignment_6_0_0 ) )
-            // InternalMenuDsl.g:4346:2: ( rule__MenuEntry__HasProcessAssignment_6_0_0 )
+            // InternalMenuDsl.g:4475:1: ( ( rule__MenuTree__TooltipAssignment_2_1 ) )
+            // InternalMenuDsl.g:4476:2: ( rule__MenuTree__TooltipAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_6_0_0()); 
+               before(grammarAccess.getMenuTreeAccess().getTooltipAssignment_2_1()); 
             }
-            // InternalMenuDsl.g:4347:2: ( rule__MenuEntry__HasProcessAssignment_6_0_0 )
-            // InternalMenuDsl.g:4347:3: rule__MenuEntry__HasProcessAssignment_6_0_0
+            // InternalMenuDsl.g:4477:2: ( rule__MenuTree__TooltipAssignment_2_1 )
+            // InternalMenuDsl.g:4477:3: rule__MenuTree__TooltipAssignment_2_1
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__HasProcessAssignment_6_0_0();
+            rule__MenuTree__TooltipAssignment_2_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15865,7 +16288,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_6_0_0()); 
+               after(grammarAccess.getMenuTreeAccess().getTooltipAssignment_2_1()); 
             }
 
             }
@@ -15885,21 +16308,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_0__0__Impl"
+    // $ANTLR end "rule__MenuTree__Group_2__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_0__1"
-    // InternalMenuDsl.g:4355:1: rule__MenuEntry__Group_6_0__1 : rule__MenuEntry__Group_6_0__1__Impl ;
-    public final void rule__MenuEntry__Group_6_0__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__0"
+    // InternalMenuDsl.g:4486:1: rule__MenuEntry__Group__0 : rule__MenuEntry__Group__0__Impl rule__MenuEntry__Group__1 ;
+    public final void rule__MenuEntry__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4359:1: ( rule__MenuEntry__Group_6_0__1__Impl )
-            // InternalMenuDsl.g:4360:2: rule__MenuEntry__Group_6_0__1__Impl
+            // InternalMenuDsl.g:4490:1: ( rule__MenuEntry__Group__0__Impl rule__MenuEntry__Group__1 )
+            // InternalMenuDsl.g:4491:2: rule__MenuEntry__Group__0__Impl rule__MenuEntry__Group__1
             {
+            pushFollow(FOLLOW_6);
+            rule__MenuEntry__Group__0__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_0__1__Impl();
+            rule__MenuEntry__Group__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15918,38 +16346,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_0__1"
+    // $ANTLR end "rule__MenuEntry__Group__0"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_0__1__Impl"
-    // InternalMenuDsl.g:4366:1: rule__MenuEntry__Group_6_0__1__Impl : ( ( rule__MenuEntry__ProcessAssignment_6_0_1 ) ) ;
-    public final void rule__MenuEntry__Group_6_0__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__0__Impl"
+    // InternalMenuDsl.g:4498:1: rule__MenuEntry__Group__0__Impl : ( 'entry' ) ;
+    public final void rule__MenuEntry__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4370:1: ( ( ( rule__MenuEntry__ProcessAssignment_6_0_1 ) ) )
-            // InternalMenuDsl.g:4371:1: ( ( rule__MenuEntry__ProcessAssignment_6_0_1 ) )
+            // InternalMenuDsl.g:4502:1: ( ( 'entry' ) )
+            // InternalMenuDsl.g:4503:1: ( 'entry' )
             {
-            // InternalMenuDsl.g:4371:1: ( ( rule__MenuEntry__ProcessAssignment_6_0_1 ) )
-            // InternalMenuDsl.g:4372:2: ( rule__MenuEntry__ProcessAssignment_6_0_1 )
+            // InternalMenuDsl.g:4503:1: ( 'entry' )
+            // InternalMenuDsl.g:4504:2: 'entry'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getProcessAssignment_6_0_1()); 
+               before(grammarAccess.getMenuEntryAccess().getEntryKeyword_0()); 
             }
-            // InternalMenuDsl.g:4373:2: ( rule__MenuEntry__ProcessAssignment_6_0_1 )
-            // InternalMenuDsl.g:4373:3: rule__MenuEntry__ProcessAssignment_6_0_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__MenuEntry__ProcessAssignment_6_0_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getProcessAssignment_6_0_1()); 
+               after(grammarAccess.getMenuEntryAccess().getEntryKeyword_0()); 
             }
 
             }
@@ -15969,26 +16387,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_0__1__Impl"
+    // $ANTLR end "rule__MenuEntry__Group__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_1__0"
-    // InternalMenuDsl.g:4382:1: rule__MenuEntry__Group_6_1__0 : rule__MenuEntry__Group_6_1__0__Impl rule__MenuEntry__Group_6_1__1 ;
-    public final void rule__MenuEntry__Group_6_1__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__1"
+    // InternalMenuDsl.g:4513:1: rule__MenuEntry__Group__1 : rule__MenuEntry__Group__1__Impl rule__MenuEntry__Group__2 ;
+    public final void rule__MenuEntry__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4386:1: ( rule__MenuEntry__Group_6_1__0__Impl rule__MenuEntry__Group_6_1__1 )
-            // InternalMenuDsl.g:4387:2: rule__MenuEntry__Group_6_1__0__Impl rule__MenuEntry__Group_6_1__1
+            // InternalMenuDsl.g:4517:1: ( rule__MenuEntry__Group__1__Impl rule__MenuEntry__Group__2 )
+            // InternalMenuDsl.g:4518:2: rule__MenuEntry__Group__1__Impl rule__MenuEntry__Group__2
             {
-            pushFollow(FOLLOW_7);
-            rule__MenuEntry__Group_6_1__0__Impl();
+            pushFollow(FOLLOW_18);
+            rule__MenuEntry__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_1__1();
+            rule__MenuEntry__Group__2();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16007,30 +16425,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_1__0"
+    // $ANTLR end "rule__MenuEntry__Group__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_1__0__Impl"
-    // InternalMenuDsl.g:4394:1: rule__MenuEntry__Group_6_1__0__Impl : ( ( rule__MenuEntry__HasPerspectiveAssignment_6_1_0 ) ) ;
-    public final void rule__MenuEntry__Group_6_1__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__1__Impl"
+    // InternalMenuDsl.g:4525:1: rule__MenuEntry__Group__1__Impl : ( ( rule__MenuEntry__NameAssignment_1 ) ) ;
+    public final void rule__MenuEntry__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4398:1: ( ( ( rule__MenuEntry__HasPerspectiveAssignment_6_1_0 ) ) )
-            // InternalMenuDsl.g:4399:1: ( ( rule__MenuEntry__HasPerspectiveAssignment_6_1_0 ) )
+            // InternalMenuDsl.g:4529:1: ( ( ( rule__MenuEntry__NameAssignment_1 ) ) )
+            // InternalMenuDsl.g:4530:1: ( ( rule__MenuEntry__NameAssignment_1 ) )
             {
-            // InternalMenuDsl.g:4399:1: ( ( rule__MenuEntry__HasPerspectiveAssignment_6_1_0 ) )
-            // InternalMenuDsl.g:4400:2: ( rule__MenuEntry__HasPerspectiveAssignment_6_1_0 )
+            // InternalMenuDsl.g:4530:1: ( ( rule__MenuEntry__NameAssignment_1 ) )
+            // InternalMenuDsl.g:4531:2: ( rule__MenuEntry__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_6_1_0()); 
+               before(grammarAccess.getMenuEntryAccess().getNameAssignment_1()); 
             }
-            // InternalMenuDsl.g:4401:2: ( rule__MenuEntry__HasPerspectiveAssignment_6_1_0 )
-            // InternalMenuDsl.g:4401:3: rule__MenuEntry__HasPerspectiveAssignment_6_1_0
+            // InternalMenuDsl.g:4532:2: ( rule__MenuEntry__NameAssignment_1 )
+            // InternalMenuDsl.g:4532:3: rule__MenuEntry__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__HasPerspectiveAssignment_6_1_0();
+            rule__MenuEntry__NameAssignment_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16038,7 +16456,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_6_1_0()); 
+               after(grammarAccess.getMenuEntryAccess().getNameAssignment_1()); 
             }
 
             }
@@ -16058,21 +16476,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_1__0__Impl"
+    // $ANTLR end "rule__MenuEntry__Group__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_1__1"
-    // InternalMenuDsl.g:4409:1: rule__MenuEntry__Group_6_1__1 : rule__MenuEntry__Group_6_1__1__Impl ;
-    public final void rule__MenuEntry__Group_6_1__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__2"
+    // InternalMenuDsl.g:4540:1: rule__MenuEntry__Group__2 : rule__MenuEntry__Group__2__Impl rule__MenuEntry__Group__3 ;
+    public final void rule__MenuEntry__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4413:1: ( rule__MenuEntry__Group_6_1__1__Impl )
-            // InternalMenuDsl.g:4414:2: rule__MenuEntry__Group_6_1__1__Impl
+            // InternalMenuDsl.g:4544:1: ( rule__MenuEntry__Group__2__Impl rule__MenuEntry__Group__3 )
+            // InternalMenuDsl.g:4545:2: rule__MenuEntry__Group__2__Impl rule__MenuEntry__Group__3
             {
+            pushFollow(FOLLOW_18);
+            rule__MenuEntry__Group__2__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_1__1__Impl();
+            rule__MenuEntry__Group__3();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16091,38 +16514,49 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_1__1"
+    // $ANTLR end "rule__MenuEntry__Group__2"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_1__1__Impl"
-    // InternalMenuDsl.g:4420:1: rule__MenuEntry__Group_6_1__1__Impl : ( ( rule__MenuEntry__PerspectiveAssignment_6_1_1 ) ) ;
-    public final void rule__MenuEntry__Group_6_1__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__2__Impl"
+    // InternalMenuDsl.g:4552:1: rule__MenuEntry__Group__2__Impl : ( ( rule__MenuEntry__Group_2__0 )? ) ;
+    public final void rule__MenuEntry__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4424:1: ( ( ( rule__MenuEntry__PerspectiveAssignment_6_1_1 ) ) )
-            // InternalMenuDsl.g:4425:1: ( ( rule__MenuEntry__PerspectiveAssignment_6_1_1 ) )
+            // InternalMenuDsl.g:4556:1: ( ( ( rule__MenuEntry__Group_2__0 )? ) )
+            // InternalMenuDsl.g:4557:1: ( ( rule__MenuEntry__Group_2__0 )? )
             {
-            // InternalMenuDsl.g:4425:1: ( ( rule__MenuEntry__PerspectiveAssignment_6_1_1 ) )
-            // InternalMenuDsl.g:4426:2: ( rule__MenuEntry__PerspectiveAssignment_6_1_1 )
+            // InternalMenuDsl.g:4557:1: ( ( rule__MenuEntry__Group_2__0 )? )
+            // InternalMenuDsl.g:4558:2: ( rule__MenuEntry__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_6_1_1()); 
+               before(grammarAccess.getMenuEntryAccess().getGroup_2()); 
             }
-            // InternalMenuDsl.g:4427:2: ( rule__MenuEntry__PerspectiveAssignment_6_1_1 )
-            // InternalMenuDsl.g:4427:3: rule__MenuEntry__PerspectiveAssignment_6_1_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__MenuEntry__PerspectiveAssignment_6_1_1();
+            // InternalMenuDsl.g:4559:2: ( rule__MenuEntry__Group_2__0 )?
+            int alt58=2;
+            int LA58_0 = input.LA(1);
 
-            state._fsp--;
-            if (state.failed) return ;
+            if ( (LA58_0==99) ) {
+                alt58=1;
+            }
+            switch (alt58) {
+                case 1 :
+                    // InternalMenuDsl.g:4559:3: rule__MenuEntry__Group_2__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__MenuEntry__Group_2__0();
+
+                    state._fsp--;
+                    if (state.failed) return ;
+
+                    }
+                    break;
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_6_1_1()); 
+               after(grammarAccess.getMenuEntryAccess().getGroup_2()); 
             }
 
             }
@@ -16142,26 +16576,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_1__1__Impl"
+    // $ANTLR end "rule__MenuEntry__Group__2__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_2__0"
-    // InternalMenuDsl.g:4436:1: rule__MenuEntry__Group_6_2__0 : rule__MenuEntry__Group_6_2__0__Impl rule__MenuEntry__Group_6_2__1 ;
-    public final void rule__MenuEntry__Group_6_2__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__3"
+    // InternalMenuDsl.g:4567:1: rule__MenuEntry__Group__3 : rule__MenuEntry__Group__3__Impl ;
+    public final void rule__MenuEntry__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4440:1: ( rule__MenuEntry__Group_6_2__0__Impl rule__MenuEntry__Group_6_2__1 )
-            // InternalMenuDsl.g:4441:2: rule__MenuEntry__Group_6_2__0__Impl rule__MenuEntry__Group_6_2__1
+            // InternalMenuDsl.g:4571:1: ( rule__MenuEntry__Group__3__Impl )
+            // InternalMenuDsl.g:4572:2: rule__MenuEntry__Group__3__Impl
             {
-            pushFollow(FOLLOW_7);
-            rule__MenuEntry__Group_6_2__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_2__1();
+            rule__MenuEntry__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16180,30 +16609,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_2__0"
+    // $ANTLR end "rule__MenuEntry__Group__3"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_2__0__Impl"
-    // InternalMenuDsl.g:4448:1: rule__MenuEntry__Group_6_2__0__Impl : ( ( rule__MenuEntry__HasTableAssignment_6_2_0 ) ) ;
-    public final void rule__MenuEntry__Group_6_2__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group__3__Impl"
+    // InternalMenuDsl.g:4578:1: rule__MenuEntry__Group__3__Impl : ( ( rule__MenuEntry__Alternatives_3 ) ) ;
+    public final void rule__MenuEntry__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4452:1: ( ( ( rule__MenuEntry__HasTableAssignment_6_2_0 ) ) )
-            // InternalMenuDsl.g:4453:1: ( ( rule__MenuEntry__HasTableAssignment_6_2_0 ) )
+            // InternalMenuDsl.g:4582:1: ( ( ( rule__MenuEntry__Alternatives_3 ) ) )
+            // InternalMenuDsl.g:4583:1: ( ( rule__MenuEntry__Alternatives_3 ) )
             {
-            // InternalMenuDsl.g:4453:1: ( ( rule__MenuEntry__HasTableAssignment_6_2_0 ) )
-            // InternalMenuDsl.g:4454:2: ( rule__MenuEntry__HasTableAssignment_6_2_0 )
+            // InternalMenuDsl.g:4583:1: ( ( rule__MenuEntry__Alternatives_3 ) )
+            // InternalMenuDsl.g:4584:2: ( rule__MenuEntry__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasTableAssignment_6_2_0()); 
+               before(grammarAccess.getMenuEntryAccess().getAlternatives_3()); 
             }
-            // InternalMenuDsl.g:4455:2: ( rule__MenuEntry__HasTableAssignment_6_2_0 )
-            // InternalMenuDsl.g:4455:3: rule__MenuEntry__HasTableAssignment_6_2_0
+            // InternalMenuDsl.g:4585:2: ( rule__MenuEntry__Alternatives_3 )
+            // InternalMenuDsl.g:4585:3: rule__MenuEntry__Alternatives_3
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__HasTableAssignment_6_2_0();
+            rule__MenuEntry__Alternatives_3();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16211,7 +16640,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasTableAssignment_6_2_0()); 
+               after(grammarAccess.getMenuEntryAccess().getAlternatives_3()); 
             }
 
             }
@@ -16231,21 +16660,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_2__0__Impl"
+    // $ANTLR end "rule__MenuEntry__Group__3__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_2__1"
-    // InternalMenuDsl.g:4463:1: rule__MenuEntry__Group_6_2__1 : rule__MenuEntry__Group_6_2__1__Impl ;
-    public final void rule__MenuEntry__Group_6_2__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_2__0"
+    // InternalMenuDsl.g:4594:1: rule__MenuEntry__Group_2__0 : rule__MenuEntry__Group_2__0__Impl rule__MenuEntry__Group_2__1 ;
+    public final void rule__MenuEntry__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4467:1: ( rule__MenuEntry__Group_6_2__1__Impl )
-            // InternalMenuDsl.g:4468:2: rule__MenuEntry__Group_6_2__1__Impl
+            // InternalMenuDsl.g:4598:1: ( rule__MenuEntry__Group_2__0__Impl rule__MenuEntry__Group_2__1 )
+            // InternalMenuDsl.g:4599:2: rule__MenuEntry__Group_2__0__Impl rule__MenuEntry__Group_2__1
             {
+            pushFollow(FOLLOW_8);
+            rule__MenuEntry__Group_2__0__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_2__1__Impl();
+            rule__MenuEntry__Group_2__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16264,30 +16698,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_2__1"
+    // $ANTLR end "rule__MenuEntry__Group_2__0"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_2__1__Impl"
-    // InternalMenuDsl.g:4474:1: rule__MenuEntry__Group_6_2__1__Impl : ( ( rule__MenuEntry__TableAssignment_6_2_1 ) ) ;
-    public final void rule__MenuEntry__Group_6_2__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_2__0__Impl"
+    // InternalMenuDsl.g:4606:1: rule__MenuEntry__Group_2__0__Impl : ( ( rule__MenuEntry__HasIconAssignment_2_0 ) ) ;
+    public final void rule__MenuEntry__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4478:1: ( ( ( rule__MenuEntry__TableAssignment_6_2_1 ) ) )
-            // InternalMenuDsl.g:4479:1: ( ( rule__MenuEntry__TableAssignment_6_2_1 ) )
+            // InternalMenuDsl.g:4610:1: ( ( ( rule__MenuEntry__HasIconAssignment_2_0 ) ) )
+            // InternalMenuDsl.g:4611:1: ( ( rule__MenuEntry__HasIconAssignment_2_0 ) )
             {
-            // InternalMenuDsl.g:4479:1: ( ( rule__MenuEntry__TableAssignment_6_2_1 ) )
-            // InternalMenuDsl.g:4480:2: ( rule__MenuEntry__TableAssignment_6_2_1 )
+            // InternalMenuDsl.g:4611:1: ( ( rule__MenuEntry__HasIconAssignment_2_0 ) )
+            // InternalMenuDsl.g:4612:2: ( rule__MenuEntry__HasIconAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getTableAssignment_6_2_1()); 
+               before(grammarAccess.getMenuEntryAccess().getHasIconAssignment_2_0()); 
             }
-            // InternalMenuDsl.g:4481:2: ( rule__MenuEntry__TableAssignment_6_2_1 )
-            // InternalMenuDsl.g:4481:3: rule__MenuEntry__TableAssignment_6_2_1
+            // InternalMenuDsl.g:4613:2: ( rule__MenuEntry__HasIconAssignment_2_0 )
+            // InternalMenuDsl.g:4613:3: rule__MenuEntry__HasIconAssignment_2_0
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__TableAssignment_6_2_1();
+            rule__MenuEntry__HasIconAssignment_2_0();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16295,7 +16729,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getTableAssignment_6_2_1()); 
+               after(grammarAccess.getMenuEntryAccess().getHasIconAssignment_2_0()); 
             }
 
             }
@@ -16315,26 +16749,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_2__1__Impl"
+    // $ANTLR end "rule__MenuEntry__Group_2__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_3__0"
-    // InternalMenuDsl.g:4490:1: rule__MenuEntry__Group_6_3__0 : rule__MenuEntry__Group_6_3__0__Impl rule__MenuEntry__Group_6_3__1 ;
-    public final void rule__MenuEntry__Group_6_3__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_2__1"
+    // InternalMenuDsl.g:4621:1: rule__MenuEntry__Group_2__1 : rule__MenuEntry__Group_2__1__Impl ;
+    public final void rule__MenuEntry__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4494:1: ( rule__MenuEntry__Group_6_3__0__Impl rule__MenuEntry__Group_6_3__1 )
-            // InternalMenuDsl.g:4495:2: rule__MenuEntry__Group_6_3__0__Impl rule__MenuEntry__Group_6_3__1
+            // InternalMenuDsl.g:4625:1: ( rule__MenuEntry__Group_2__1__Impl )
+            // InternalMenuDsl.g:4626:2: rule__MenuEntry__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_7);
-            rule__MenuEntry__Group_6_3__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_3__1();
+            rule__MenuEntry__Group_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16353,30 +16782,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_3__0"
+    // $ANTLR end "rule__MenuEntry__Group_2__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_3__0__Impl"
-    // InternalMenuDsl.g:4502:1: rule__MenuEntry__Group_6_3__0__Impl : ( ( rule__MenuEntry__HasDialogAssignment_6_3_0 ) ) ;
-    public final void rule__MenuEntry__Group_6_3__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_2__1__Impl"
+    // InternalMenuDsl.g:4632:1: rule__MenuEntry__Group_2__1__Impl : ( ( rule__MenuEntry__IconAssignment_2_1 ) ) ;
+    public final void rule__MenuEntry__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4506:1: ( ( ( rule__MenuEntry__HasDialogAssignment_6_3_0 ) ) )
-            // InternalMenuDsl.g:4507:1: ( ( rule__MenuEntry__HasDialogAssignment_6_3_0 ) )
+            // InternalMenuDsl.g:4636:1: ( ( ( rule__MenuEntry__IconAssignment_2_1 ) ) )
+            // InternalMenuDsl.g:4637:1: ( ( rule__MenuEntry__IconAssignment_2_1 ) )
             {
-            // InternalMenuDsl.g:4507:1: ( ( rule__MenuEntry__HasDialogAssignment_6_3_0 ) )
-            // InternalMenuDsl.g:4508:2: ( rule__MenuEntry__HasDialogAssignment_6_3_0 )
+            // InternalMenuDsl.g:4637:1: ( ( rule__MenuEntry__IconAssignment_2_1 ) )
+            // InternalMenuDsl.g:4638:2: ( rule__MenuEntry__IconAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasDialogAssignment_6_3_0()); 
+               before(grammarAccess.getMenuEntryAccess().getIconAssignment_2_1()); 
             }
-            // InternalMenuDsl.g:4509:2: ( rule__MenuEntry__HasDialogAssignment_6_3_0 )
-            // InternalMenuDsl.g:4509:3: rule__MenuEntry__HasDialogAssignment_6_3_0
+            // InternalMenuDsl.g:4639:2: ( rule__MenuEntry__IconAssignment_2_1 )
+            // InternalMenuDsl.g:4639:3: rule__MenuEntry__IconAssignment_2_1
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__HasDialogAssignment_6_3_0();
+            rule__MenuEntry__IconAssignment_2_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16384,7 +16813,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasDialogAssignment_6_3_0()); 
+               after(grammarAccess.getMenuEntryAccess().getIconAssignment_2_1()); 
             }
 
             }
@@ -16404,21 +16833,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_3__0__Impl"
+    // $ANTLR end "rule__MenuEntry__Group_2__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_3__1"
-    // InternalMenuDsl.g:4517:1: rule__MenuEntry__Group_6_3__1 : rule__MenuEntry__Group_6_3__1__Impl ;
-    public final void rule__MenuEntry__Group_6_3__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_0__0"
+    // InternalMenuDsl.g:4648:1: rule__MenuEntry__Group_3_0__0 : rule__MenuEntry__Group_3_0__0__Impl rule__MenuEntry__Group_3_0__1 ;
+    public final void rule__MenuEntry__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4521:1: ( rule__MenuEntry__Group_6_3__1__Impl )
-            // InternalMenuDsl.g:4522:2: rule__MenuEntry__Group_6_3__1__Impl
+            // InternalMenuDsl.g:4652:1: ( rule__MenuEntry__Group_3_0__0__Impl rule__MenuEntry__Group_3_0__1 )
+            // InternalMenuDsl.g:4653:2: rule__MenuEntry__Group_3_0__0__Impl rule__MenuEntry__Group_3_0__1
             {
+            pushFollow(FOLLOW_6);
+            rule__MenuEntry__Group_3_0__0__Impl();
+
+            state._fsp--;
+            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_6_3__1__Impl();
+            rule__MenuEntry__Group_3_0__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16437,30 +16871,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_3__1"
+    // $ANTLR end "rule__MenuEntry__Group_3_0__0"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_6_3__1__Impl"
-    // InternalMenuDsl.g:4528:1: rule__MenuEntry__Group_6_3__1__Impl : ( ( rule__MenuEntry__DialogAssignment_6_3_1 ) ) ;
-    public final void rule__MenuEntry__Group_6_3__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_0__0__Impl"
+    // InternalMenuDsl.g:4660:1: rule__MenuEntry__Group_3_0__0__Impl : ( ( rule__MenuEntry__HasProcessAssignment_3_0_0 ) ) ;
+    public final void rule__MenuEntry__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4532:1: ( ( ( rule__MenuEntry__DialogAssignment_6_3_1 ) ) )
-            // InternalMenuDsl.g:4533:1: ( ( rule__MenuEntry__DialogAssignment_6_3_1 ) )
+            // InternalMenuDsl.g:4664:1: ( ( ( rule__MenuEntry__HasProcessAssignment_3_0_0 ) ) )
+            // InternalMenuDsl.g:4665:1: ( ( rule__MenuEntry__HasProcessAssignment_3_0_0 ) )
             {
-            // InternalMenuDsl.g:4533:1: ( ( rule__MenuEntry__DialogAssignment_6_3_1 ) )
-            // InternalMenuDsl.g:4534:2: ( rule__MenuEntry__DialogAssignment_6_3_1 )
+            // InternalMenuDsl.g:4665:1: ( ( rule__MenuEntry__HasProcessAssignment_3_0_0 ) )
+            // InternalMenuDsl.g:4666:2: ( rule__MenuEntry__HasProcessAssignment_3_0_0 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDialogAssignment_6_3_1()); 
+               before(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_3_0_0()); 
             }
-            // InternalMenuDsl.g:4535:2: ( rule__MenuEntry__DialogAssignment_6_3_1 )
-            // InternalMenuDsl.g:4535:3: rule__MenuEntry__DialogAssignment_6_3_1
+            // InternalMenuDsl.g:4667:2: ( rule__MenuEntry__HasProcessAssignment_3_0_0 )
+            // InternalMenuDsl.g:4667:3: rule__MenuEntry__HasProcessAssignment_3_0_0
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__DialogAssignment_6_3_1();
+            rule__MenuEntry__HasProcessAssignment_3_0_0();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16468,7 +16902,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDialogAssignment_6_3_1()); 
+               after(grammarAccess.getMenuEntryAccess().getHasProcessAssignment_3_0_0()); 
             }
 
             }
@@ -16488,26 +16922,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_6_3__1__Impl"
+    // $ANTLR end "rule__MenuEntry__Group_3_0__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_7__0"
-    // InternalMenuDsl.g:4544:1: rule__MenuEntry__Group_7__0 : rule__MenuEntry__Group_7__0__Impl rule__MenuEntry__Group_7__1 ;
-    public final void rule__MenuEntry__Group_7__0() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_0__1"
+    // InternalMenuDsl.g:4675:1: rule__MenuEntry__Group_3_0__1 : rule__MenuEntry__Group_3_0__1__Impl ;
+    public final void rule__MenuEntry__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4548:1: ( rule__MenuEntry__Group_7__0__Impl rule__MenuEntry__Group_7__1 )
-            // InternalMenuDsl.g:4549:2: rule__MenuEntry__Group_7__0__Impl rule__MenuEntry__Group_7__1
+            // InternalMenuDsl.g:4679:1: ( rule__MenuEntry__Group_3_0__1__Impl )
+            // InternalMenuDsl.g:4680:2: rule__MenuEntry__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_16);
-            rule__MenuEntry__Group_7__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_7__1();
+            rule__MenuEntry__Group_3_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16526,28 +16955,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_7__0"
+    // $ANTLR end "rule__MenuEntry__Group_3_0__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_7__0__Impl"
-    // InternalMenuDsl.g:4556:1: rule__MenuEntry__Group_7__0__Impl : ( '{' ) ;
-    public final void rule__MenuEntry__Group_7__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_0__1__Impl"
+    // InternalMenuDsl.g:4686:1: rule__MenuEntry__Group_3_0__1__Impl : ( ( rule__MenuEntry__ProcessAssignment_3_0_1 ) ) ;
+    public final void rule__MenuEntry__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4560:1: ( ( '{' ) )
-            // InternalMenuDsl.g:4561:1: ( '{' )
+            // InternalMenuDsl.g:4690:1: ( ( ( rule__MenuEntry__ProcessAssignment_3_0_1 ) ) )
+            // InternalMenuDsl.g:4691:1: ( ( rule__MenuEntry__ProcessAssignment_3_0_1 ) )
             {
-            // InternalMenuDsl.g:4561:1: ( '{' )
-            // InternalMenuDsl.g:4562:2: '{'
+            // InternalMenuDsl.g:4691:1: ( ( rule__MenuEntry__ProcessAssignment_3_0_1 ) )
+            // InternalMenuDsl.g:4692:2: ( rule__MenuEntry__ProcessAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getLeftCurlyBracketKeyword_7_0()); 
+               before(grammarAccess.getMenuEntryAccess().getProcessAssignment_3_0_1()); 
             }
-            match(input,52,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:4693:2: ( rule__MenuEntry__ProcessAssignment_3_0_1 )
+            // InternalMenuDsl.g:4693:3: rule__MenuEntry__ProcessAssignment_3_0_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuEntry__ProcessAssignment_3_0_1();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getLeftCurlyBracketKeyword_7_0()); 
+               after(grammarAccess.getMenuEntryAccess().getProcessAssignment_3_0_1()); 
             }
 
             }
@@ -16567,26 +17006,26 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_7__0__Impl"
+    // $ANTLR end "rule__MenuEntry__Group_3_0__1__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_7__1"
-    // InternalMenuDsl.g:4571:1: rule__MenuEntry__Group_7__1 : rule__MenuEntry__Group_7__1__Impl rule__MenuEntry__Group_7__2 ;
-    public final void rule__MenuEntry__Group_7__1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_1__0"
+    // InternalMenuDsl.g:4702:1: rule__MenuEntry__Group_3_1__0 : rule__MenuEntry__Group_3_1__0__Impl rule__MenuEntry__Group_3_1__1 ;
+    public final void rule__MenuEntry__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4575:1: ( rule__MenuEntry__Group_7__1__Impl rule__MenuEntry__Group_7__2 )
-            // InternalMenuDsl.g:4576:2: rule__MenuEntry__Group_7__1__Impl rule__MenuEntry__Group_7__2
+            // InternalMenuDsl.g:4706:1: ( rule__MenuEntry__Group_3_1__0__Impl rule__MenuEntry__Group_3_1__1 )
+            // InternalMenuDsl.g:4707:2: rule__MenuEntry__Group_3_1__0__Impl rule__MenuEntry__Group_3_1__1
             {
-            pushFollow(FOLLOW_16);
-            rule__MenuEntry__Group_7__1__Impl();
+            pushFollow(FOLLOW_6);
+            rule__MenuEntry__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_7__2();
+            rule__MenuEntry__Group_3_1__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16605,56 +17044,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_7__1"
+    // $ANTLR end "rule__MenuEntry__Group_3_1__0"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_7__1__Impl"
-    // InternalMenuDsl.g:4583:1: rule__MenuEntry__Group_7__1__Impl : ( ( rule__MenuEntry__SubentriesAssignment_7_1 )* ) ;
-    public final void rule__MenuEntry__Group_7__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_1__0__Impl"
+    // InternalMenuDsl.g:4714:1: rule__MenuEntry__Group_3_1__0__Impl : ( ( rule__MenuEntry__HasPerspectiveAssignment_3_1_0 ) ) ;
+    public final void rule__MenuEntry__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4587:1: ( ( ( rule__MenuEntry__SubentriesAssignment_7_1 )* ) )
-            // InternalMenuDsl.g:4588:1: ( ( rule__MenuEntry__SubentriesAssignment_7_1 )* )
+            // InternalMenuDsl.g:4718:1: ( ( ( rule__MenuEntry__HasPerspectiveAssignment_3_1_0 ) ) )
+            // InternalMenuDsl.g:4719:1: ( ( rule__MenuEntry__HasPerspectiveAssignment_3_1_0 ) )
             {
-            // InternalMenuDsl.g:4588:1: ( ( rule__MenuEntry__SubentriesAssignment_7_1 )* )
-            // InternalMenuDsl.g:4589:2: ( rule__MenuEntry__SubentriesAssignment_7_1 )*
+            // InternalMenuDsl.g:4719:1: ( ( rule__MenuEntry__HasPerspectiveAssignment_3_1_0 ) )
+            // InternalMenuDsl.g:4720:2: ( rule__MenuEntry__HasPerspectiveAssignment_3_1_0 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getSubentriesAssignment_7_1()); 
+               before(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_3_1_0()); 
             }
-            // InternalMenuDsl.g:4590:2: ( rule__MenuEntry__SubentriesAssignment_7_1 )*
-            loop60:
-            do {
-                int alt60=2;
-                int LA60_0 = input.LA(1);
-
-                if ( (LA60_0==58) ) {
-                    alt60=1;
-                }
-
-
-                switch (alt60) {
-            	case 1 :
-            	    // InternalMenuDsl.g:4590:3: rule__MenuEntry__SubentriesAssignment_7_1
-            	    {
-            	    pushFollow(FOLLOW_13);
-            	    rule__MenuEntry__SubentriesAssignment_7_1();
-
-            	    state._fsp--;
-            	    if (state.failed) return ;
+            // InternalMenuDsl.g:4721:2: ( rule__MenuEntry__HasPerspectiveAssignment_3_1_0 )
+            // InternalMenuDsl.g:4721:3: rule__MenuEntry__HasPerspectiveAssignment_3_1_0
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuEntry__HasPerspectiveAssignment_3_1_0();
 
-            	    }
-            	    break;
+            state._fsp--;
+            if (state.failed) return ;
 
-            	default :
-            	    break loop60;
-                }
-            } while (true);
+            }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getSubentriesAssignment_7_1()); 
+               after(grammarAccess.getMenuEntryAccess().getHasPerspectiveAssignment_3_1_0()); 
             }
 
             }
@@ -16674,21 +17095,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_7__1__Impl"
+    // $ANTLR end "rule__MenuEntry__Group_3_1__0__Impl"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_7__2"
-    // InternalMenuDsl.g:4598:1: rule__MenuEntry__Group_7__2 : rule__MenuEntry__Group_7__2__Impl ;
-    public final void rule__MenuEntry__Group_7__2() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_1__1"
+    // InternalMenuDsl.g:4729:1: rule__MenuEntry__Group_3_1__1 : rule__MenuEntry__Group_3_1__1__Impl ;
+    public final void rule__MenuEntry__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4602:1: ( rule__MenuEntry__Group_7__2__Impl )
-            // InternalMenuDsl.g:4603:2: rule__MenuEntry__Group_7__2__Impl
+            // InternalMenuDsl.g:4733:1: ( rule__MenuEntry__Group_3_1__1__Impl )
+            // InternalMenuDsl.g:4734:2: rule__MenuEntry__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__MenuEntry__Group_7__2__Impl();
+            rule__MenuEntry__Group_3_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -16707,28 +17128,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_7__2"
+    // $ANTLR end "rule__MenuEntry__Group_3_1__1"
 
 
-    // $ANTLR start "rule__MenuEntry__Group_7__2__Impl"
-    // InternalMenuDsl.g:4609:1: rule__MenuEntry__Group_7__2__Impl : ( '}' ) ;
-    public final void rule__MenuEntry__Group_7__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__Group_3_1__1__Impl"
+    // InternalMenuDsl.g:4740:1: rule__MenuEntry__Group_3_1__1__Impl : ( ( rule__MenuEntry__PerspectiveAssignment_3_1_1 ) ) ;
+    public final void rule__MenuEntry__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4613:1: ( ( '}' ) )
-            // InternalMenuDsl.g:4614:1: ( '}' )
+            // InternalMenuDsl.g:4744:1: ( ( ( rule__MenuEntry__PerspectiveAssignment_3_1_1 ) ) )
+            // InternalMenuDsl.g:4745:1: ( ( rule__MenuEntry__PerspectiveAssignment_3_1_1 ) )
             {
-            // InternalMenuDsl.g:4614:1: ( '}' )
-            // InternalMenuDsl.g:4615:2: '}'
+            // InternalMenuDsl.g:4745:1: ( ( rule__MenuEntry__PerspectiveAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:4746:2: ( rule__MenuEntry__PerspectiveAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getRightCurlyBracketKeyword_7_2()); 
+               before(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_3_1_1()); 
             }
-            match(input,55,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:4747:2: ( rule__MenuEntry__PerspectiveAssignment_3_1_1 )
+            // InternalMenuDsl.g:4747:3: rule__MenuEntry__PerspectiveAssignment_3_1_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__MenuEntry__PerspectiveAssignment_3_1_1();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getRightCurlyBracketKeyword_7_2()); 
+               after(grammarAccess.getMenuEntryAccess().getPerspectiveAssignment_3_1_1()); 
             }
 
             }
@@ -16748,20 +17179,20 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__Group_7__2__Impl"
+    // $ANTLR end "rule__MenuEntry__Group_3_1__1__Impl"
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0"
-    // InternalMenuDsl.g:4625:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
+    // InternalMenuDsl.g:4756: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 {
-            // InternalMenuDsl.g:4629:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
-            // InternalMenuDsl.g:4630:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
+            // InternalMenuDsl.g:4760:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
+            // InternalMenuDsl.g:4761:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_19);
             rule__XImportDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -16790,23 +17221,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0__Impl"
-    // InternalMenuDsl.g:4637:1: rule__XImportDeclaration__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:4768:1: rule__XImportDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4641:1: ( ( () ) )
-            // InternalMenuDsl.g:4642:1: ( () )
+            // InternalMenuDsl.g:4772:1: ( ( () ) )
+            // InternalMenuDsl.g:4773:1: ( () )
             {
-            // InternalMenuDsl.g:4642:1: ( () )
-            // InternalMenuDsl.g:4643:2: ()
+            // InternalMenuDsl.g:4773:1: ( () )
+            // InternalMenuDsl.g:4774:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getOXImportDeclarationAction_0()); 
             }
-            // InternalMenuDsl.g:4644:2: ()
-            // InternalMenuDsl.g:4644:3: 
+            // InternalMenuDsl.g:4775:2: ()
+            // InternalMenuDsl.g:4775:3: 
             {
             }
 
@@ -16831,16 +17262,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1"
-    // InternalMenuDsl.g:4652:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
+    // InternalMenuDsl.g:4783: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 {
-            // InternalMenuDsl.g:4656:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
-            // InternalMenuDsl.g:4657:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
+            // InternalMenuDsl.g:4787:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
+            // InternalMenuDsl.g:4788:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
             {
-            pushFollow(FOLLOW_18);
+            pushFollow(FOLLOW_20);
             rule__XImportDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -16869,17 +17300,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1__Impl"
-    // InternalMenuDsl.g:4664:1: rule__XImportDeclaration__Group__1__Impl : ( 'import' ) ;
+    // InternalMenuDsl.g:4795:1: rule__XImportDeclaration__Group__1__Impl : ( 'import' ) ;
     public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4668:1: ( ( 'import' ) )
-            // InternalMenuDsl.g:4669:1: ( 'import' )
+            // InternalMenuDsl.g:4799:1: ( ( 'import' ) )
+            // InternalMenuDsl.g:4800:1: ( 'import' )
             {
-            // InternalMenuDsl.g:4669:1: ( 'import' )
-            // InternalMenuDsl.g:4670:2: 'import'
+            // InternalMenuDsl.g:4800:1: ( 'import' )
+            // InternalMenuDsl.g:4801:2: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportKeyword_1()); 
@@ -16910,16 +17341,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2"
-    // InternalMenuDsl.g:4679:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3 ;
+    // InternalMenuDsl.g:4810: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 {
-            // InternalMenuDsl.g:4683:1: ( rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3 )
-            // InternalMenuDsl.g:4684:2: rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3
+            // InternalMenuDsl.g:4814:1: ( rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3 )
+            // InternalMenuDsl.g:4815:2: rule__XImportDeclaration__Group__2__Impl rule__XImportDeclaration__Group__3
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_21);
             rule__XImportDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -16948,23 +17379,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2__Impl"
-    // InternalMenuDsl.g:4691:1: rule__XImportDeclaration__Group__2__Impl : ( ( rule__XImportDeclaration__Alternatives_2 ) ) ;
+    // InternalMenuDsl.g:4822:1: rule__XImportDeclaration__Group__2__Impl : ( ( rule__XImportDeclaration__Alternatives_2 ) ) ;
     public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4695:1: ( ( ( rule__XImportDeclaration__Alternatives_2 ) ) )
-            // InternalMenuDsl.g:4696:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
+            // InternalMenuDsl.g:4826:1: ( ( ( rule__XImportDeclaration__Alternatives_2 ) ) )
+            // InternalMenuDsl.g:4827:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
             {
-            // InternalMenuDsl.g:4696:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
-            // InternalMenuDsl.g:4697:2: ( rule__XImportDeclaration__Alternatives_2 )
+            // InternalMenuDsl.g:4827:1: ( ( rule__XImportDeclaration__Alternatives_2 ) )
+            // InternalMenuDsl.g:4828:2: ( rule__XImportDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_2()); 
             }
-            // InternalMenuDsl.g:4698:2: ( rule__XImportDeclaration__Alternatives_2 )
-            // InternalMenuDsl.g:4698:3: rule__XImportDeclaration__Alternatives_2
+            // InternalMenuDsl.g:4829:2: ( rule__XImportDeclaration__Alternatives_2 )
+            // InternalMenuDsl.g:4829:3: rule__XImportDeclaration__Alternatives_2
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_2();
@@ -16999,14 +17430,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__3"
-    // InternalMenuDsl.g:4706:1: rule__XImportDeclaration__Group__3 : rule__XImportDeclaration__Group__3__Impl ;
+    // InternalMenuDsl.g:4837:1: rule__XImportDeclaration__Group__3 : rule__XImportDeclaration__Group__3__Impl ;
     public final void rule__XImportDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4710:1: ( rule__XImportDeclaration__Group__3__Impl )
-            // InternalMenuDsl.g:4711:2: rule__XImportDeclaration__Group__3__Impl
+            // InternalMenuDsl.g:4841:1: ( rule__XImportDeclaration__Group__3__Impl )
+            // InternalMenuDsl.g:4842:2: rule__XImportDeclaration__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__3__Impl();
@@ -17032,33 +17463,33 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__3__Impl"
-    // InternalMenuDsl.g:4717:1: rule__XImportDeclaration__Group__3__Impl : ( ( ';' )? ) ;
+    // InternalMenuDsl.g:4848:1: rule__XImportDeclaration__Group__3__Impl : ( ( ';' )? ) ;
     public final void rule__XImportDeclaration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4721:1: ( ( ( ';' )? ) )
-            // InternalMenuDsl.g:4722:1: ( ( ';' )? )
+            // InternalMenuDsl.g:4852:1: ( ( ( ';' )? ) )
+            // InternalMenuDsl.g:4853:1: ( ( ';' )? )
             {
-            // InternalMenuDsl.g:4722:1: ( ( ';' )? )
-            // InternalMenuDsl.g:4723:2: ( ';' )?
+            // InternalMenuDsl.g:4853:1: ( ( ';' )? )
+            // InternalMenuDsl.g:4854:2: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_3()); 
             }
-            // InternalMenuDsl.g:4724:2: ( ';' )?
-            int alt61=2;
-            int LA61_0 = input.LA(1);
+            // InternalMenuDsl.g:4855:2: ( ';' )?
+            int alt59=2;
+            int LA59_0 = input.LA(1);
 
-            if ( (LA61_0==59) ) {
-                alt61=1;
+            if ( (LA59_0==61) ) {
+                alt59=1;
             }
-            switch (alt61) {
+            switch (alt59) {
                 case 1 :
-                    // InternalMenuDsl.g:4724:3: ';'
+                    // InternalMenuDsl.g:4855:3: ';'
                     {
-                    match(input,59,FOLLOW_2); if (state.failed) return ;
+                    match(input,61,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -17090,16 +17521,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__0"
-    // InternalMenuDsl.g:4733:1: rule__XImportDeclaration__Group_2_0__0 : rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1 ;
+    // InternalMenuDsl.g:4864: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 {
-            // InternalMenuDsl.g:4737:1: ( rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1 )
-            // InternalMenuDsl.g:4738:2: rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1
+            // InternalMenuDsl.g:4868:1: ( rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1 )
+            // InternalMenuDsl.g:4869:2: rule__XImportDeclaration__Group_2_0__0__Impl rule__XImportDeclaration__Group_2_0__1
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_22);
             rule__XImportDeclaration__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -17128,23 +17559,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__0__Impl"
-    // InternalMenuDsl.g:4745:1: rule__XImportDeclaration__Group_2_0__0__Impl : ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) ) ;
+    // InternalMenuDsl.g:4876: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 {
-            // InternalMenuDsl.g:4749:1: ( ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) ) )
-            // InternalMenuDsl.g:4750:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
+            // InternalMenuDsl.g:4880:1: ( ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) ) )
+            // InternalMenuDsl.g:4881:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
             {
-            // InternalMenuDsl.g:4750:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
-            // InternalMenuDsl.g:4751:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
+            // InternalMenuDsl.g:4881:1: ( ( rule__XImportDeclaration__StaticAssignment_2_0_0 ) )
+            // InternalMenuDsl.g:4882:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticAssignment_2_0_0()); 
             }
-            // InternalMenuDsl.g:4752:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
-            // InternalMenuDsl.g:4752:3: rule__XImportDeclaration__StaticAssignment_2_0_0
+            // InternalMenuDsl.g:4883:2: ( rule__XImportDeclaration__StaticAssignment_2_0_0 )
+            // InternalMenuDsl.g:4883:3: rule__XImportDeclaration__StaticAssignment_2_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__StaticAssignment_2_0_0();
@@ -17179,16 +17610,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__1"
-    // InternalMenuDsl.g:4760:1: rule__XImportDeclaration__Group_2_0__1 : rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2 ;
+    // InternalMenuDsl.g:4891: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 {
-            // InternalMenuDsl.g:4764:1: ( rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2 )
-            // InternalMenuDsl.g:4765:2: rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2
+            // InternalMenuDsl.g:4895:1: ( rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2 )
+            // InternalMenuDsl.g:4896:2: rule__XImportDeclaration__Group_2_0__1__Impl rule__XImportDeclaration__Group_2_0__2
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_22);
             rule__XImportDeclaration__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -17217,31 +17648,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__1__Impl"
-    // InternalMenuDsl.g:4772:1: rule__XImportDeclaration__Group_2_0__1__Impl : ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? ) ;
+    // InternalMenuDsl.g:4903: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 {
-            // InternalMenuDsl.g:4776:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? ) )
-            // InternalMenuDsl.g:4777:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
+            // InternalMenuDsl.g:4907:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? ) )
+            // InternalMenuDsl.g:4908:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
             {
-            // InternalMenuDsl.g:4777:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
-            // InternalMenuDsl.g:4778:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
+            // InternalMenuDsl.g:4908:1: ( ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )? )
+            // InternalMenuDsl.g:4909:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionAssignment_2_0_1()); 
             }
-            // InternalMenuDsl.g:4779:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
-            int alt62=2;
-            int LA62_0 = input.LA(1);
+            // InternalMenuDsl.g:4910:2: ( rule__XImportDeclaration__ExtensionAssignment_2_0_1 )?
+            int alt60=2;
+            int LA60_0 = input.LA(1);
 
-            if ( (LA62_0==48) ) {
-                alt62=1;
+            if ( (LA60_0==48) ) {
+                alt60=1;
             }
-            switch (alt62) {
+            switch (alt60) {
                 case 1 :
-                    // InternalMenuDsl.g:4779:3: rule__XImportDeclaration__ExtensionAssignment_2_0_1
+                    // InternalMenuDsl.g:4910:3: rule__XImportDeclaration__ExtensionAssignment_2_0_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ExtensionAssignment_2_0_1();
@@ -17279,16 +17710,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__2"
-    // InternalMenuDsl.g:4787:1: rule__XImportDeclaration__Group_2_0__2 : rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3 ;
+    // InternalMenuDsl.g:4918: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 {
-            // InternalMenuDsl.g:4791:1: ( rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3 )
-            // InternalMenuDsl.g:4792:2: rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3
+            // InternalMenuDsl.g:4922:1: ( rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3 )
+            // InternalMenuDsl.g:4923:2: rule__XImportDeclaration__Group_2_0__2__Impl rule__XImportDeclaration__Group_2_0__3
             {
-            pushFollow(FOLLOW_21);
+            pushFollow(FOLLOW_23);
             rule__XImportDeclaration__Group_2_0__2__Impl();
 
             state._fsp--;
@@ -17317,23 +17748,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__2__Impl"
-    // InternalMenuDsl.g:4799:1: rule__XImportDeclaration__Group_2_0__2__Impl : ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) ) ;
+    // InternalMenuDsl.g:4930: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 {
-            // InternalMenuDsl.g:4803:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) ) )
-            // InternalMenuDsl.g:4804:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
+            // InternalMenuDsl.g:4934:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) ) )
+            // InternalMenuDsl.g:4935:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
             {
-            // InternalMenuDsl.g:4804:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
-            // InternalMenuDsl.g:4805:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
+            // InternalMenuDsl.g:4935:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 ) )
+            // InternalMenuDsl.g:4936:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_2_0_2()); 
             }
-            // InternalMenuDsl.g:4806:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
-            // InternalMenuDsl.g:4806:3: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2
+            // InternalMenuDsl.g:4937:2: ( rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 )
+            // InternalMenuDsl.g:4937:3: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__ImportedTypeAssignment_2_0_2();
@@ -17368,14 +17799,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__3"
-    // InternalMenuDsl.g:4814:1: rule__XImportDeclaration__Group_2_0__3 : rule__XImportDeclaration__Group_2_0__3__Impl ;
+    // InternalMenuDsl.g:4945: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 {
-            // InternalMenuDsl.g:4818:1: ( rule__XImportDeclaration__Group_2_0__3__Impl )
-            // InternalMenuDsl.g:4819:2: rule__XImportDeclaration__Group_2_0__3__Impl
+            // InternalMenuDsl.g:4949:1: ( rule__XImportDeclaration__Group_2_0__3__Impl )
+            // InternalMenuDsl.g:4950:2: rule__XImportDeclaration__Group_2_0__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_2_0__3__Impl();
@@ -17401,23 +17832,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_0__3__Impl"
-    // InternalMenuDsl.g:4825:1: rule__XImportDeclaration__Group_2_0__3__Impl : ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) ) ;
+    // InternalMenuDsl.g:4956: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 {
-            // InternalMenuDsl.g:4829:1: ( ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) ) )
-            // InternalMenuDsl.g:4830:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
+            // InternalMenuDsl.g:4960:1: ( ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) ) )
+            // InternalMenuDsl.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
             {
-            // InternalMenuDsl.g:4830:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
-            // InternalMenuDsl.g:4831:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
+            // InternalMenuDsl.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_2_0_3 ) )
+            // InternalMenuDsl.g:4962:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_2_0_3()); 
             }
-            // InternalMenuDsl.g:4832:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
-            // InternalMenuDsl.g:4832:3: rule__XImportDeclaration__Alternatives_2_0_3
+            // InternalMenuDsl.g:4963:2: ( rule__XImportDeclaration__Alternatives_2_0_3 )
+            // InternalMenuDsl.g:4963:3: rule__XImportDeclaration__Alternatives_2_0_3
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_2_0_3();
@@ -17452,16 +17883,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__0"
-    // InternalMenuDsl.g:4841:1: rule__XImportDeclaration__Group_2_3__0 : rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1 ;
+    // InternalMenuDsl.g:4972: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 {
-            // InternalMenuDsl.g:4845:1: ( rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1 )
-            // InternalMenuDsl.g:4846:2: rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1
+            // InternalMenuDsl.g:4976:1: ( rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1 )
+            // InternalMenuDsl.g:4977:2: rule__XImportDeclaration__Group_2_3__0__Impl rule__XImportDeclaration__Group_2_3__1
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__XImportDeclaration__Group_2_3__0__Impl();
 
             state._fsp--;
@@ -17490,23 +17921,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__0__Impl"
-    // InternalMenuDsl.g:4853:1: rule__XImportDeclaration__Group_2_3__0__Impl : ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) ) ;
+    // InternalMenuDsl.g:4984: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 {
-            // InternalMenuDsl.g:4857:1: ( ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) ) )
-            // InternalMenuDsl.g:4858:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
+            // InternalMenuDsl.g:4988:1: ( ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) ) )
+            // InternalMenuDsl.g:4989:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
             {
-            // InternalMenuDsl.g:4858:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
-            // InternalMenuDsl.g:4859:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
+            // InternalMenuDsl.g:4989:1: ( ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 ) )
+            // InternalMenuDsl.g:4990:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getFqnImportAssignment_2_3_0()); 
             }
-            // InternalMenuDsl.g:4860:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
-            // InternalMenuDsl.g:4860:3: rule__XImportDeclaration__FqnImportAssignment_2_3_0
+            // InternalMenuDsl.g:4991:2: ( rule__XImportDeclaration__FqnImportAssignment_2_3_0 )
+            // InternalMenuDsl.g:4991:3: rule__XImportDeclaration__FqnImportAssignment_2_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__FqnImportAssignment_2_3_0();
@@ -17541,14 +17972,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__1"
-    // InternalMenuDsl.g:4868:1: rule__XImportDeclaration__Group_2_3__1 : rule__XImportDeclaration__Group_2_3__1__Impl ;
+    // InternalMenuDsl.g:4999: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 {
-            // InternalMenuDsl.g:4872:1: ( rule__XImportDeclaration__Group_2_3__1__Impl )
-            // InternalMenuDsl.g:4873:2: rule__XImportDeclaration__Group_2_3__1__Impl
+            // InternalMenuDsl.g:5003:1: ( rule__XImportDeclaration__Group_2_3__1__Impl )
+            // InternalMenuDsl.g:5004:2: rule__XImportDeclaration__Group_2_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_2_3__1__Impl();
@@ -17574,23 +18005,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_2_3__1__Impl"
-    // InternalMenuDsl.g:4879:1: rule__XImportDeclaration__Group_2_3__1__Impl : ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) ) ;
+    // InternalMenuDsl.g:5010: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 {
-            // InternalMenuDsl.g:4883:1: ( ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) ) )
-            // InternalMenuDsl.g:4884:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
+            // InternalMenuDsl.g:5014:1: ( ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) ) )
+            // InternalMenuDsl.g:5015:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
             {
-            // InternalMenuDsl.g:4884:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
-            // InternalMenuDsl.g:4885:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
+            // InternalMenuDsl.g:5015:1: ( ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 ) )
+            // InternalMenuDsl.g:5016:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedFullyQualifiedNameAssignment_2_3_1()); 
             }
-            // InternalMenuDsl.g:4886:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
-            // InternalMenuDsl.g:4886:3: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1
+            // InternalMenuDsl.g:5017:2: ( rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 )
+            // InternalMenuDsl.g:5017:3: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1
             {
             pushFollow(FOLLOW_2);
             rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1();
@@ -17625,16 +18056,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__0"
-    // InternalMenuDsl.g:4895:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
+    // InternalMenuDsl.g:5026: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 {
-            // InternalMenuDsl.g:4899:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
-            // InternalMenuDsl.g:4900:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
+            // InternalMenuDsl.g:5030:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
+            // InternalMenuDsl.g:5031:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
             {
-            pushFollow(FOLLOW_22);
+            pushFollow(FOLLOW_24);
             rule__XAnnotation__Group__0__Impl();
 
             state._fsp--;
@@ -17663,23 +18094,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__0__Impl"
-    // InternalMenuDsl.g:4907:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:5038:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
     public final void rule__XAnnotation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4911:1: ( ( () ) )
-            // InternalMenuDsl.g:4912:1: ( () )
+            // InternalMenuDsl.g:5042:1: ( ( () ) )
+            // InternalMenuDsl.g:5043:1: ( () )
             {
-            // InternalMenuDsl.g:4912:1: ( () )
-            // InternalMenuDsl.g:4913:2: ()
+            // InternalMenuDsl.g:5043:1: ( () )
+            // InternalMenuDsl.g:5044:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getXAnnotationAction_0()); 
             }
-            // InternalMenuDsl.g:4914:2: ()
-            // InternalMenuDsl.g:4914:3: 
+            // InternalMenuDsl.g:5045:2: ()
+            // InternalMenuDsl.g:5045:3: 
             {
             }
 
@@ -17704,16 +18135,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__1"
-    // InternalMenuDsl.g:4922:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
+    // InternalMenuDsl.g:5053: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 {
-            // InternalMenuDsl.g:4926:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
-            // InternalMenuDsl.g:4927:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
+            // InternalMenuDsl.g:5057:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
+            // InternalMenuDsl.g:5058:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__XAnnotation__Group__1__Impl();
 
             state._fsp--;
@@ -17742,22 +18173,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__1__Impl"
-    // InternalMenuDsl.g:4934:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
+    // InternalMenuDsl.g:5065:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
     public final void rule__XAnnotation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4938:1: ( ( '@' ) )
-            // InternalMenuDsl.g:4939:1: ( '@' )
+            // InternalMenuDsl.g:5069:1: ( ( '@' ) )
+            // InternalMenuDsl.g:5070:1: ( '@' )
             {
-            // InternalMenuDsl.g:4939:1: ( '@' )
-            // InternalMenuDsl.g:4940:2: '@'
+            // InternalMenuDsl.g:5070:1: ( '@' )
+            // InternalMenuDsl.g:5071:2: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
-            match(input,60,FOLLOW_2); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
@@ -17783,16 +18214,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__2"
-    // InternalMenuDsl.g:4949:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
+    // InternalMenuDsl.g:5080: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 {
-            // InternalMenuDsl.g:4953:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
-            // InternalMenuDsl.g:4954:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
+            // InternalMenuDsl.g:5084:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
+            // InternalMenuDsl.g:5085:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XAnnotation__Group__2__Impl();
 
             state._fsp--;
@@ -17821,23 +18252,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__2__Impl"
-    // InternalMenuDsl.g:4961:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
+    // InternalMenuDsl.g:5092:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
     public final void rule__XAnnotation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4965:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
-            // InternalMenuDsl.g:4966:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalMenuDsl.g:5096:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
+            // InternalMenuDsl.g:5097:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
             {
-            // InternalMenuDsl.g:4966:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
-            // InternalMenuDsl.g:4967:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalMenuDsl.g:5097:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalMenuDsl.g:5098:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeAssignment_2()); 
             }
-            // InternalMenuDsl.g:4968:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
-            // InternalMenuDsl.g:4968:3: rule__XAnnotation__AnnotationTypeAssignment_2
+            // InternalMenuDsl.g:5099:2: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalMenuDsl.g:5099:3: rule__XAnnotation__AnnotationTypeAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__AnnotationTypeAssignment_2();
@@ -17872,14 +18303,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__3"
-    // InternalMenuDsl.g:4976:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
+    // InternalMenuDsl.g:5107:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
     public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:4980:1: ( rule__XAnnotation__Group__3__Impl )
-            // InternalMenuDsl.g:4981:2: rule__XAnnotation__Group__3__Impl
+            // InternalMenuDsl.g:5111:1: ( rule__XAnnotation__Group__3__Impl )
+            // InternalMenuDsl.g:5112:2: rule__XAnnotation__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__3__Impl();
@@ -17905,31 +18336,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group__3__Impl"
-    // InternalMenuDsl.g:4987:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:5118: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 {
-            // InternalMenuDsl.g:4991:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
-            // InternalMenuDsl.g:4992:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalMenuDsl.g:5122:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
+            // InternalMenuDsl.g:5123:1: ( ( rule__XAnnotation__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:4992:1: ( ( rule__XAnnotation__Group_3__0 )? )
-            // InternalMenuDsl.g:4993:2: ( rule__XAnnotation__Group_3__0 )?
+            // InternalMenuDsl.g:5123:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalMenuDsl.g:5124:2: ( rule__XAnnotation__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:4994:2: ( rule__XAnnotation__Group_3__0 )?
-            int alt63=2;
-            int LA63_0 = input.LA(1);
+            // InternalMenuDsl.g:5125:2: ( rule__XAnnotation__Group_3__0 )?
+            int alt61=2;
+            int LA61_0 = input.LA(1);
 
-            if ( (LA63_0==61) ) {
-                alt63=1;
+            if ( (LA61_0==63) ) {
+                alt61=1;
             }
-            switch (alt63) {
+            switch (alt61) {
                 case 1 :
-                    // InternalMenuDsl.g:4994:3: rule__XAnnotation__Group_3__0
+                    // InternalMenuDsl.g:5125:3: rule__XAnnotation__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotation__Group_3__0();
@@ -17967,16 +18398,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0"
-    // InternalMenuDsl.g:5003:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
+    // InternalMenuDsl.g:5134: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 {
-            // InternalMenuDsl.g:5007:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
-            // InternalMenuDsl.g:5008:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
+            // InternalMenuDsl.g:5138:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
+            // InternalMenuDsl.g:5139:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
             {
-            pushFollow(FOLLOW_24);
+            pushFollow(FOLLOW_26);
             rule__XAnnotation__Group_3__0__Impl();
 
             state._fsp--;
@@ -18005,25 +18436,25 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0__Impl"
-    // InternalMenuDsl.g:5015:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
+    // InternalMenuDsl.g:5146:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
     public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5019:1: ( ( ( '(' ) ) )
-            // InternalMenuDsl.g:5020:1: ( ( '(' ) )
+            // InternalMenuDsl.g:5150:1: ( ( ( '(' ) ) )
+            // InternalMenuDsl.g:5151:1: ( ( '(' ) )
             {
-            // InternalMenuDsl.g:5020:1: ( ( '(' ) )
-            // InternalMenuDsl.g:5021:2: ( '(' )
+            // InternalMenuDsl.g:5151:1: ( ( '(' ) )
+            // InternalMenuDsl.g:5152:2: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0()); 
             }
-            // InternalMenuDsl.g:5022:2: ( '(' )
-            // InternalMenuDsl.g:5022:3: '('
+            // InternalMenuDsl.g:5153:2: ( '(' )
+            // InternalMenuDsl.g:5153:3: '('
             {
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -18052,16 +18483,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1"
-    // InternalMenuDsl.g:5030:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
+    // InternalMenuDsl.g:5161: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 {
-            // InternalMenuDsl.g:5034:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
-            // InternalMenuDsl.g:5035:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
+            // InternalMenuDsl.g:5165:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
+            // InternalMenuDsl.g:5166:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
             {
-            pushFollow(FOLLOW_24);
+            pushFollow(FOLLOW_26);
             rule__XAnnotation__Group_3__1__Impl();
 
             state._fsp--;
@@ -18090,31 +18521,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1__Impl"
-    // InternalMenuDsl.g:5042:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
+    // InternalMenuDsl.g:5173: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 {
-            // InternalMenuDsl.g:5046:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
-            // InternalMenuDsl.g:5047:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalMenuDsl.g:5177:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
+            // InternalMenuDsl.g:5178:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
             {
-            // InternalMenuDsl.g:5047:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
-            // InternalMenuDsl.g:5048:2: ( rule__XAnnotation__Alternatives_3_1 )?
+            // InternalMenuDsl.g:5178:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalMenuDsl.g:5179:2: ( rule__XAnnotation__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAlternatives_3_1()); 
             }
-            // InternalMenuDsl.g:5049:2: ( rule__XAnnotation__Alternatives_3_1 )?
-            int alt64=2;
-            int LA64_0 = input.LA(1);
+            // InternalMenuDsl.g:5180:2: ( rule__XAnnotation__Alternatives_3_1 )?
+            int alt62=2;
+            int LA62_0 = input.LA(1);
 
-            if ( ((LA64_0>=RULE_STRING && LA64_0<=RULE_DECIMAL)||LA64_0==27||(LA64_0>=34 && LA64_0<=35)||LA64_0==40||(LA64_0>=45 && LA64_0<=50)||LA64_0==52||(LA64_0>=60 && LA64_0<=61)||(LA64_0>=65 && LA64_0<=66)||LA64_0==69||LA64_0==71||(LA64_0>=75 && LA64_0<=83)||LA64_0==85||LA64_0==105) ) {
-                alt64=1;
+            if ( ((LA62_0>=RULE_STRING && LA62_0<=RULE_DECIMAL)||LA62_0==27||(LA62_0>=34 && LA62_0<=35)||LA62_0==40||(LA62_0>=45 && LA62_0<=50)||LA62_0==57||(LA62_0>=62 && LA62_0<=63)||(LA62_0>=67 && LA62_0<=68)||LA62_0==71||LA62_0==73||(LA62_0>=77 && LA62_0<=85)||LA62_0==87||LA62_0==107) ) {
+                alt62=1;
             }
-            switch (alt64) {
+            switch (alt62) {
                 case 1 :
-                    // InternalMenuDsl.g:5049:3: rule__XAnnotation__Alternatives_3_1
+                    // InternalMenuDsl.g:5180:3: rule__XAnnotation__Alternatives_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotation__Alternatives_3_1();
@@ -18152,14 +18583,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2"
-    // InternalMenuDsl.g:5057:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
+    // InternalMenuDsl.g:5188: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 {
-            // InternalMenuDsl.g:5061:1: ( rule__XAnnotation__Group_3__2__Impl )
-            // InternalMenuDsl.g:5062:2: rule__XAnnotation__Group_3__2__Impl
+            // InternalMenuDsl.g:5192:1: ( rule__XAnnotation__Group_3__2__Impl )
+            // InternalMenuDsl.g:5193:2: rule__XAnnotation__Group_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__2__Impl();
@@ -18185,22 +18616,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2__Impl"
-    // InternalMenuDsl.g:5068:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:5199:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5072:1: ( ( ')' ) )
-            // InternalMenuDsl.g:5073:1: ( ')' )
+            // InternalMenuDsl.g:5203:1: ( ( ')' ) )
+            // InternalMenuDsl.g:5204:1: ( ')' )
             {
-            // InternalMenuDsl.g:5073:1: ( ')' )
-            // InternalMenuDsl.g:5074:2: ')'
+            // InternalMenuDsl.g:5204:1: ( ')' )
+            // InternalMenuDsl.g:5205:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -18226,16 +18657,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0"
-    // InternalMenuDsl.g:5084:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
+    // InternalMenuDsl.g:5215: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 {
-            // InternalMenuDsl.g:5088:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
-            // InternalMenuDsl.g:5089:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
+            // InternalMenuDsl.g:5219:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
+            // InternalMenuDsl.g:5220:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XAnnotation__Group_3_1_0__0__Impl();
 
             state._fsp--;
@@ -18264,23 +18695,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0__Impl"
-    // InternalMenuDsl.g:5096:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
+    // InternalMenuDsl.g:5227: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 {
-            // InternalMenuDsl.g:5100:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
-            // InternalMenuDsl.g:5101:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalMenuDsl.g:5231:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
+            // InternalMenuDsl.g:5232:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
             {
-            // InternalMenuDsl.g:5101:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
-            // InternalMenuDsl.g:5102:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalMenuDsl.g:5232:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalMenuDsl.g:5233:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_0()); 
             }
-            // InternalMenuDsl.g:5103:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
-            // InternalMenuDsl.g:5103:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
+            // InternalMenuDsl.g:5234:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalMenuDsl.g:5234:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0();
@@ -18315,14 +18746,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1"
-    // InternalMenuDsl.g:5111:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
+    // InternalMenuDsl.g:5242: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 {
-            // InternalMenuDsl.g:5115:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
-            // InternalMenuDsl.g:5116:2: rule__XAnnotation__Group_3_1_0__1__Impl
+            // InternalMenuDsl.g:5246:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
+            // InternalMenuDsl.g:5247:2: rule__XAnnotation__Group_3_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0__1__Impl();
@@ -18348,37 +18779,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1__Impl"
-    // InternalMenuDsl.g:5122:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
+    // InternalMenuDsl.g:5253: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 {
-            // InternalMenuDsl.g:5126:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
-            // InternalMenuDsl.g:5127:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalMenuDsl.g:5257:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
+            // InternalMenuDsl.g:5258:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
             {
-            // InternalMenuDsl.g:5127:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
-            // InternalMenuDsl.g:5128:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            // InternalMenuDsl.g:5258:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalMenuDsl.g:5259:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0_1()); 
             }
-            // InternalMenuDsl.g:5129:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
-            loop65:
+            // InternalMenuDsl.g:5260:2: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            loop63:
             do {
-                int alt65=2;
-                int LA65_0 = input.LA(1);
+                int alt63=2;
+                int LA63_0 = input.LA(1);
 
-                if ( (LA65_0==63) ) {
-                    alt65=1;
+                if ( (LA63_0==65) ) {
+                    alt63=1;
                 }
 
 
-                switch (alt65) {
+                switch (alt63) {
             	case 1 :
-            	    // InternalMenuDsl.g:5129:3: rule__XAnnotation__Group_3_1_0_1__0
+            	    // InternalMenuDsl.g:5260:3: rule__XAnnotation__Group_3_1_0_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XAnnotation__Group_3_1_0_1__0();
 
             	    state._fsp--;
@@ -18388,7 +18819,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop65;
+            	    break loop63;
                 }
             } while (true);
 
@@ -18417,16 +18848,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0"
-    // InternalMenuDsl.g:5138: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 ;
+    // InternalMenuDsl.g:5269: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 {
-            // InternalMenuDsl.g:5142:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
-            // InternalMenuDsl.g:5143:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
+            // InternalMenuDsl.g:5273:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
+            // InternalMenuDsl.g:5274:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__XAnnotation__Group_3_1_0_1__0__Impl();
 
             state._fsp--;
@@ -18455,22 +18886,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0__Impl"
-    // InternalMenuDsl.g:5150:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:5281: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 {
-            // InternalMenuDsl.g:5154:1: ( ( ',' ) )
-            // InternalMenuDsl.g:5155:1: ( ',' )
+            // InternalMenuDsl.g:5285:1: ( ( ',' ) )
+            // InternalMenuDsl.g:5286:1: ( ',' )
             {
-            // InternalMenuDsl.g:5155:1: ( ',' )
-            // InternalMenuDsl.g:5156:2: ','
+            // InternalMenuDsl.g:5286:1: ( ',' )
+            // InternalMenuDsl.g:5287:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
@@ -18496,14 +18927,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1"
-    // InternalMenuDsl.g:5165:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
+    // InternalMenuDsl.g:5296: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 {
-            // InternalMenuDsl.g:5169:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
-            // InternalMenuDsl.g:5170:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
+            // InternalMenuDsl.g:5300:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
+            // InternalMenuDsl.g:5301:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0_1__1__Impl();
@@ -18529,23 +18960,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1__Impl"
-    // InternalMenuDsl.g:5176:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
+    // InternalMenuDsl.g:5307: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 {
-            // InternalMenuDsl.g:5180:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
-            // InternalMenuDsl.g:5181:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalMenuDsl.g:5311:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
+            // InternalMenuDsl.g:5312:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
             {
-            // InternalMenuDsl.g:5181:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
-            // InternalMenuDsl.g:5182:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalMenuDsl.g:5312:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalMenuDsl.g:5313:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_1_1()); 
             }
-            // InternalMenuDsl.g:5183:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
-            // InternalMenuDsl.g:5183:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
+            // InternalMenuDsl.g:5314:2: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalMenuDsl.g:5314:3: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1();
@@ -18580,16 +19011,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0"
-    // InternalMenuDsl.g:5192:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
+    // InternalMenuDsl.g:5323: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 {
-            // InternalMenuDsl.g:5196:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
-            // InternalMenuDsl.g:5197:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
+            // InternalMenuDsl.g:5327:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
+            // InternalMenuDsl.g:5328:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAnnotationElementValuePair__Group__0__Impl();
 
             state._fsp--;
@@ -18618,23 +19049,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0__Impl"
-    // InternalMenuDsl.g:5204:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
+    // InternalMenuDsl.g:5335: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 {
-            // InternalMenuDsl.g:5208:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
-            // InternalMenuDsl.g:5209:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalMenuDsl.g:5339:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
+            // InternalMenuDsl.g:5340:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
             {
-            // InternalMenuDsl.g:5209:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
-            // InternalMenuDsl.g:5210:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalMenuDsl.g:5340:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalMenuDsl.g:5341:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0()); 
             }
-            // InternalMenuDsl.g:5211:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
-            // InternalMenuDsl.g:5211:3: rule__XAnnotationElementValuePair__Group_0__0
+            // InternalMenuDsl.g:5342:2: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalMenuDsl.g:5342:3: rule__XAnnotationElementValuePair__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0();
@@ -18669,14 +19100,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1"
-    // InternalMenuDsl.g:5219:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
+    // InternalMenuDsl.g:5350:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5223:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
-            // InternalMenuDsl.g:5224:2: rule__XAnnotationElementValuePair__Group__1__Impl
+            // InternalMenuDsl.g:5354:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
+            // InternalMenuDsl.g:5355:2: rule__XAnnotationElementValuePair__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__1__Impl();
@@ -18702,23 +19133,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1__Impl"
-    // InternalMenuDsl.g:5230:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
+    // InternalMenuDsl.g:5361:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5234:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
-            // InternalMenuDsl.g:5235:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalMenuDsl.g:5365:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
+            // InternalMenuDsl.g:5366:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
             {
-            // InternalMenuDsl.g:5235:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
-            // InternalMenuDsl.g:5236:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalMenuDsl.g:5366:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalMenuDsl.g:5367:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueAssignment_1()); 
             }
-            // InternalMenuDsl.g:5237:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
-            // InternalMenuDsl.g:5237:3: rule__XAnnotationElementValuePair__ValueAssignment_1
+            // InternalMenuDsl.g:5368:2: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalMenuDsl.g:5368:3: rule__XAnnotationElementValuePair__ValueAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ValueAssignment_1();
@@ -18753,14 +19184,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0"
-    // InternalMenuDsl.g:5246:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
+    // InternalMenuDsl.g:5377: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 {
-            // InternalMenuDsl.g:5250:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
-            // InternalMenuDsl.g:5251:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
+            // InternalMenuDsl.g:5381:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
+            // InternalMenuDsl.g:5382:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0__Impl();
@@ -18786,23 +19217,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0__Impl"
-    // InternalMenuDsl.g:5257:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
+    // InternalMenuDsl.g:5388: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 {
-            // InternalMenuDsl.g:5261:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
-            // InternalMenuDsl.g:5262:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalMenuDsl.g:5392:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
+            // InternalMenuDsl.g:5393:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
             {
-            // InternalMenuDsl.g:5262:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
-            // InternalMenuDsl.g:5263:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalMenuDsl.g:5393:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalMenuDsl.g:5394:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0_0()); 
             }
-            // InternalMenuDsl.g:5264:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
-            // InternalMenuDsl.g:5264:3: rule__XAnnotationElementValuePair__Group_0_0__0
+            // InternalMenuDsl.g:5395:2: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalMenuDsl.g:5395:3: rule__XAnnotationElementValuePair__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__0();
@@ -18837,16 +19268,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0"
-    // InternalMenuDsl.g:5273:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
+    // InternalMenuDsl.g:5404: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 {
-            // InternalMenuDsl.g:5277:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
-            // InternalMenuDsl.g:5278:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
+            // InternalMenuDsl.g:5408:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
+            // InternalMenuDsl.g:5409:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__XAnnotationElementValuePair__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -18875,23 +19306,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0__Impl"
-    // InternalMenuDsl.g:5285:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
+    // InternalMenuDsl.g:5416: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 {
-            // InternalMenuDsl.g:5289:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
-            // InternalMenuDsl.g:5290:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalMenuDsl.g:5420:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
+            // InternalMenuDsl.g:5421:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
             {
-            // InternalMenuDsl.g:5290:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
-            // InternalMenuDsl.g:5291:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalMenuDsl.g:5421:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalMenuDsl.g:5422:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementAssignment_0_0_0()); 
             }
-            // InternalMenuDsl.g:5292:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
-            // InternalMenuDsl.g:5292:3: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
+            // InternalMenuDsl.g:5423:2: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalMenuDsl.g:5423:3: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ElementAssignment_0_0_0();
@@ -18926,14 +19357,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1"
-    // InternalMenuDsl.g:5300:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
+    // InternalMenuDsl.g:5431: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 {
-            // InternalMenuDsl.g:5304:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
-            // InternalMenuDsl.g:5305:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
+            // InternalMenuDsl.g:5435:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
+            // InternalMenuDsl.g:5436:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__1__Impl();
@@ -18959,17 +19390,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1__Impl"
-    // InternalMenuDsl.g:5311:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
+    // InternalMenuDsl.g:5442:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5315:1: ( ( '=' ) )
-            // InternalMenuDsl.g:5316:1: ( '=' )
+            // InternalMenuDsl.g:5446:1: ( ( '=' ) )
+            // InternalMenuDsl.g:5447:1: ( '=' )
             {
-            // InternalMenuDsl.g:5316:1: ( '=' )
-            // InternalMenuDsl.g:5317:2: '='
+            // InternalMenuDsl.g:5447:1: ( '=' )
+            // InternalMenuDsl.g:5448:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
@@ -19000,16 +19431,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0"
-    // InternalMenuDsl.g:5327:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
+    // InternalMenuDsl.g:5458: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 {
-            // InternalMenuDsl.g:5331:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
-            // InternalMenuDsl.g:5332:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
+            // InternalMenuDsl.g:5462:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
+            // InternalMenuDsl.g:5463:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl();
 
             state._fsp--;
@@ -19038,23 +19469,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl"
-    // InternalMenuDsl.g:5339:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
+    // InternalMenuDsl.g:5470: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 {
-            // InternalMenuDsl.g:5343:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
-            // InternalMenuDsl.g:5344:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalMenuDsl.g:5474:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
+            // InternalMenuDsl.g:5475:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
             {
-            // InternalMenuDsl.g:5344:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
-            // InternalMenuDsl.g:5345:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalMenuDsl.g:5475:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalMenuDsl.g:5476:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0()); 
             }
-            // InternalMenuDsl.g:5346:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
-            // InternalMenuDsl.g:5346:3: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
+            // InternalMenuDsl.g:5477:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalMenuDsl.g:5477:3: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0();
@@ -19089,16 +19520,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1"
-    // InternalMenuDsl.g:5354:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
+    // InternalMenuDsl.g:5485: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 {
-            // InternalMenuDsl.g:5358:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
-            // InternalMenuDsl.g:5359:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
+            // InternalMenuDsl.g:5489:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
+            // InternalMenuDsl.g:5490:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl();
 
             state._fsp--;
@@ -19127,31 +19558,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl"
-    // InternalMenuDsl.g:5366:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
+    // InternalMenuDsl.g:5497: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 {
-            // InternalMenuDsl.g:5370:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
-            // InternalMenuDsl.g:5371:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalMenuDsl.g:5501:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
+            // InternalMenuDsl.g:5502:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
             {
-            // InternalMenuDsl.g:5371:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
-            // InternalMenuDsl.g:5372:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            // InternalMenuDsl.g:5502:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalMenuDsl.g:5503:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1()); 
             }
-            // InternalMenuDsl.g:5373:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
-            int alt66=2;
-            int LA66_0 = input.LA(1);
+            // InternalMenuDsl.g:5504:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            int alt64=2;
+            int LA64_0 = input.LA(1);
 
-            if ( ((LA66_0>=RULE_STRING && LA66_0<=RULE_DECIMAL)||LA66_0==27||(LA66_0>=34 && LA66_0<=35)||LA66_0==40||(LA66_0>=45 && LA66_0<=50)||LA66_0==52||(LA66_0>=60 && LA66_0<=61)||(LA66_0>=65 && LA66_0<=66)||LA66_0==69||LA66_0==71||(LA66_0>=75 && LA66_0<=83)||LA66_0==85||LA66_0==105) ) {
-                alt66=1;
+            if ( ((LA64_0>=RULE_STRING && LA64_0<=RULE_DECIMAL)||LA64_0==27||(LA64_0>=34 && LA64_0<=35)||LA64_0==40||(LA64_0>=45 && LA64_0<=50)||LA64_0==57||(LA64_0>=62 && LA64_0<=63)||(LA64_0>=67 && LA64_0<=68)||LA64_0==71||LA64_0==73||(LA64_0>=77 && LA64_0<=85)||LA64_0==87||LA64_0==107) ) {
+                alt64=1;
             }
-            switch (alt66) {
+            switch (alt64) {
                 case 1 :
-                    // InternalMenuDsl.g:5373:3: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
+                    // InternalMenuDsl.g:5504:3: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_0_1__0();
@@ -19189,14 +19620,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2"
-    // InternalMenuDsl.g:5381:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
+    // InternalMenuDsl.g:5512: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 {
-            // InternalMenuDsl.g:5385:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
-            // InternalMenuDsl.g:5386:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
+            // InternalMenuDsl.g:5516:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
+            // InternalMenuDsl.g:5517:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl();
@@ -19222,22 +19653,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl"
-    // InternalMenuDsl.g:5392:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
+    // InternalMenuDsl.g:5523:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5396:1: ( ( ']' ) )
-            // InternalMenuDsl.g:5397:1: ( ']' )
+            // InternalMenuDsl.g:5527:1: ( ( ']' ) )
+            // InternalMenuDsl.g:5528:1: ( ']' )
             {
-            // InternalMenuDsl.g:5397:1: ( ']' )
-            // InternalMenuDsl.g:5398:2: ']'
+            // InternalMenuDsl.g:5528:1: ( ']' )
+            // InternalMenuDsl.g:5529:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,64,FOLLOW_2); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -19263,14 +19694,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0"
-    // InternalMenuDsl.g:5408:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
+    // InternalMenuDsl.g:5539: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 {
-            // InternalMenuDsl.g:5412:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
-            // InternalMenuDsl.g:5413:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
+            // InternalMenuDsl.g:5543:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
+            // InternalMenuDsl.g:5544:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl();
@@ -19296,23 +19727,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl"
-    // InternalMenuDsl.g:5419:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
+    // InternalMenuDsl.g:5550: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 {
-            // InternalMenuDsl.g:5423:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
-            // InternalMenuDsl.g:5424:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalMenuDsl.g:5554:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
+            // InternalMenuDsl.g:5555:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
             {
-            // InternalMenuDsl.g:5424:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
-            // InternalMenuDsl.g:5425:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalMenuDsl.g:5555:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalMenuDsl.g:5556:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0_0()); 
             }
-            // InternalMenuDsl.g:5426:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
-            // InternalMenuDsl.g:5426:3: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
+            // InternalMenuDsl.g:5557:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalMenuDsl.g:5557:3: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0();
@@ -19347,16 +19778,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0"
-    // InternalMenuDsl.g:5435:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
+    // InternalMenuDsl.g:5566: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 {
-            // InternalMenuDsl.g:5439:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
-            // InternalMenuDsl.g:5440:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
+            // InternalMenuDsl.g:5570:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
+            // InternalMenuDsl.g:5571:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_32);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl();
 
             state._fsp--;
@@ -19385,23 +19816,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl"
-    // InternalMenuDsl.g:5447:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:5578: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 {
-            // InternalMenuDsl.g:5451:1: ( ( () ) )
-            // InternalMenuDsl.g:5452:1: ( () )
+            // InternalMenuDsl.g:5582:1: ( ( () ) )
+            // InternalMenuDsl.g:5583:1: ( () )
             {
-            // InternalMenuDsl.g:5452:1: ( () )
-            // InternalMenuDsl.g:5453:2: ()
+            // InternalMenuDsl.g:5583:1: ( () )
+            // InternalMenuDsl.g:5584:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // InternalMenuDsl.g:5454:2: ()
-            // InternalMenuDsl.g:5454:3: 
+            // InternalMenuDsl.g:5585:2: ()
+            // InternalMenuDsl.g:5585:3: 
             {
             }
 
@@ -19426,16 +19857,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1"
-    // InternalMenuDsl.g:5462:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
+    // InternalMenuDsl.g:5593: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 {
-            // InternalMenuDsl.g:5466:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
-            // InternalMenuDsl.g:5467:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
+            // InternalMenuDsl.g:5597:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
+            // InternalMenuDsl.g:5598:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl();
 
             state._fsp--;
@@ -19464,22 +19895,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl"
-    // InternalMenuDsl.g:5474:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalMenuDsl.g:5605: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 {
-            // InternalMenuDsl.g:5478:1: ( ( '#' ) )
-            // InternalMenuDsl.g:5479:1: ( '#' )
+            // InternalMenuDsl.g:5609:1: ( ( '#' ) )
+            // InternalMenuDsl.g:5610:1: ( '#' )
             {
-            // InternalMenuDsl.g:5479:1: ( '#' )
-            // InternalMenuDsl.g:5480:2: '#'
+            // InternalMenuDsl.g:5610:1: ( '#' )
+            // InternalMenuDsl.g:5611:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,65,FOLLOW_2); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -19505,14 +19936,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2"
-    // InternalMenuDsl.g:5489:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
+    // InternalMenuDsl.g:5620: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 {
-            // InternalMenuDsl.g:5493:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
-            // InternalMenuDsl.g:5494:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
+            // InternalMenuDsl.g:5624:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
+            // InternalMenuDsl.g:5625:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl();
@@ -19538,22 +19969,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl"
-    // InternalMenuDsl.g:5500:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalMenuDsl.g:5631: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 {
-            // InternalMenuDsl.g:5504:1: ( ( '[' ) )
-            // InternalMenuDsl.g:5505:1: ( '[' )
+            // InternalMenuDsl.g:5635:1: ( ( '[' ) )
+            // InternalMenuDsl.g:5636:1: ( '[' )
             {
-            // InternalMenuDsl.g:5505:1: ( '[' )
-            // InternalMenuDsl.g:5506:2: '['
+            // InternalMenuDsl.g:5636:1: ( '[' )
+            // InternalMenuDsl.g:5637:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,66,FOLLOW_2); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -19579,16 +20010,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0"
-    // InternalMenuDsl.g:5516:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
+    // InternalMenuDsl.g:5647: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 {
-            // InternalMenuDsl.g:5520:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
-            // InternalMenuDsl.g:5521:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
+            // InternalMenuDsl.g:5651:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
+            // InternalMenuDsl.g:5652:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -19617,23 +20048,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl"
-    // InternalMenuDsl.g:5528:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
+    // InternalMenuDsl.g:5659: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 {
-            // InternalMenuDsl.g:5532:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
-            // InternalMenuDsl.g:5533:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalMenuDsl.g:5663:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
+            // InternalMenuDsl.g:5664:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
             {
-            // InternalMenuDsl.g:5533:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
-            // InternalMenuDsl.g:5534:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalMenuDsl.g:5664:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalMenuDsl.g:5665:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_0()); 
             }
-            // InternalMenuDsl.g:5535:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
-            // InternalMenuDsl.g:5535:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
+            // InternalMenuDsl.g:5666:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalMenuDsl.g:5666:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0();
@@ -19668,14 +20099,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1"
-    // InternalMenuDsl.g:5543:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
+    // InternalMenuDsl.g:5674: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 {
-            // InternalMenuDsl.g:5547:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
-            // InternalMenuDsl.g:5548:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
+            // InternalMenuDsl.g:5678:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
+            // InternalMenuDsl.g:5679:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl();
@@ -19701,37 +20132,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl"
-    // InternalMenuDsl.g:5554:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
+    // InternalMenuDsl.g:5685: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 {
-            // InternalMenuDsl.g:5558:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
-            // InternalMenuDsl.g:5559:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalMenuDsl.g:5689:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
+            // InternalMenuDsl.g:5690:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
             {
-            // InternalMenuDsl.g:5559:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
-            // InternalMenuDsl.g:5560:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            // InternalMenuDsl.g:5690:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalMenuDsl.g:5691:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1_1()); 
             }
-            // InternalMenuDsl.g:5561:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
-            loop67:
+            // InternalMenuDsl.g:5692:2: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            loop65:
             do {
-                int alt67=2;
-                int LA67_0 = input.LA(1);
+                int alt65=2;
+                int LA65_0 = input.LA(1);
 
-                if ( (LA67_0==63) ) {
-                    alt67=1;
+                if ( (LA65_0==65) ) {
+                    alt65=1;
                 }
 
 
-                switch (alt67) {
+                switch (alt65) {
             	case 1 :
-            	    // InternalMenuDsl.g:5561:3: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
+            	    // InternalMenuDsl.g:5692:3: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -19741,7 +20172,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop67;
+            	    break loop65;
                 }
             } while (true);
 
@@ -19770,16 +20201,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0"
-    // InternalMenuDsl.g:5570:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
+    // InternalMenuDsl.g:5701: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 {
-            // InternalMenuDsl.g:5574:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
-            // InternalMenuDsl.g:5575:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
+            // InternalMenuDsl.g:5705:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
+            // InternalMenuDsl.g:5706:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl();
 
             state._fsp--;
@@ -19808,22 +20239,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl"
-    // InternalMenuDsl.g:5582:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:5713: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 {
-            // InternalMenuDsl.g:5586:1: ( ( ',' ) )
-            // InternalMenuDsl.g:5587:1: ( ',' )
+            // InternalMenuDsl.g:5717:1: ( ( ',' ) )
+            // InternalMenuDsl.g:5718:1: ( ',' )
             {
-            // InternalMenuDsl.g:5587:1: ( ',' )
-            // InternalMenuDsl.g:5588:2: ','
+            // InternalMenuDsl.g:5718:1: ( ',' )
+            // InternalMenuDsl.g:5719:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -19849,14 +20280,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1"
-    // InternalMenuDsl.g:5597:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
+    // InternalMenuDsl.g:5728: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 {
-            // InternalMenuDsl.g:5601:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
-            // InternalMenuDsl.g:5602:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
+            // InternalMenuDsl.g:5732:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
+            // InternalMenuDsl.g:5733:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl();
@@ -19882,23 +20313,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl"
-    // InternalMenuDsl.g:5608:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalMenuDsl.g:5739: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 {
-            // InternalMenuDsl.g:5612:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
-            // InternalMenuDsl.g:5613:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalMenuDsl.g:5743:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalMenuDsl.g:5744:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
             {
-            // InternalMenuDsl.g:5613:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
-            // InternalMenuDsl.g:5614:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalMenuDsl.g:5744:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalMenuDsl.g:5745:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // InternalMenuDsl.g:5615:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
-            // InternalMenuDsl.g:5615:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
+            // InternalMenuDsl.g:5746:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalMenuDsl.g:5746:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1();
@@ -19933,16 +20364,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0"
-    // InternalMenuDsl.g:5624:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
+    // InternalMenuDsl.g:5755: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 {
-            // InternalMenuDsl.g:5628:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
-            // InternalMenuDsl.g:5629:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
+            // InternalMenuDsl.g:5759:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
+            // InternalMenuDsl.g:5760:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl();
 
             state._fsp--;
@@ -19971,17 +20402,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl"
-    // InternalMenuDsl.g:5636:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
+    // InternalMenuDsl.g:5767:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5640:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalMenuDsl.g:5641:1: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:5771:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalMenuDsl.g:5772:1: ( ruleXAnnotationOrExpression )
             {
-            // InternalMenuDsl.g:5641:1: ( ruleXAnnotationOrExpression )
-            // InternalMenuDsl.g:5642:2: ruleXAnnotationOrExpression
+            // InternalMenuDsl.g:5772:1: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:5773:2: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
@@ -20016,14 +20447,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1"
-    // InternalMenuDsl.g:5651:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
+    // InternalMenuDsl.g:5782: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 {
-            // InternalMenuDsl.g:5655:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
-            // InternalMenuDsl.g:5656:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
+            // InternalMenuDsl.g:5786:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
+            // InternalMenuDsl.g:5787:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl();
@@ -20049,31 +20480,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl"
-    // InternalMenuDsl.g:5662:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
+    // InternalMenuDsl.g:5793: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 {
-            // InternalMenuDsl.g:5666:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
-            // InternalMenuDsl.g:5667:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalMenuDsl.g:5797:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
+            // InternalMenuDsl.g:5798:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
             {
-            // InternalMenuDsl.g:5667:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
-            // InternalMenuDsl.g:5668:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            // InternalMenuDsl.g:5798:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalMenuDsl.g:5799:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1()); 
             }
-            // InternalMenuDsl.g:5669:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
-            int alt68=2;
-            int LA68_0 = input.LA(1);
+            // InternalMenuDsl.g:5800:2: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            int alt66=2;
+            int LA66_0 = input.LA(1);
 
-            if ( (LA68_0==63) ) {
-                alt68=1;
+            if ( (LA66_0==65) ) {
+                alt66=1;
             }
-            switch (alt68) {
+            switch (alt66) {
                 case 1 :
-                    // InternalMenuDsl.g:5669:3: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
+                    // InternalMenuDsl.g:5800:3: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_1_1__0();
@@ -20111,16 +20542,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0"
-    // InternalMenuDsl.g:5678:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
+    // InternalMenuDsl.g:5809: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 {
-            // InternalMenuDsl.g:5682:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
-            // InternalMenuDsl.g:5683:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
+            // InternalMenuDsl.g:5813:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
+            // InternalMenuDsl.g:5814:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -20149,23 +20580,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl"
-    // InternalMenuDsl.g:5690:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:5821:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5694:1: ( ( () ) )
-            // InternalMenuDsl.g:5695:1: ( () )
+            // InternalMenuDsl.g:5825:1: ( ( () ) )
+            // InternalMenuDsl.g:5826:1: ( () )
             {
-            // InternalMenuDsl.g:5695:1: ( () )
-            // InternalMenuDsl.g:5696:2: ()
+            // InternalMenuDsl.g:5826:1: ( () )
+            // InternalMenuDsl.g:5827:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()); 
             }
-            // InternalMenuDsl.g:5697:2: ()
-            // InternalMenuDsl.g:5697:3: 
+            // InternalMenuDsl.g:5828:2: ()
+            // InternalMenuDsl.g:5828:3: 
             {
             }
 
@@ -20190,14 +20621,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1"
-    // InternalMenuDsl.g:5705:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
+    // InternalMenuDsl.g:5836: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 {
-            // InternalMenuDsl.g:5709:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
-            // InternalMenuDsl.g:5710:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
+            // InternalMenuDsl.g:5840:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
+            // InternalMenuDsl.g:5841:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl();
@@ -20223,28 +20654,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl"
-    // InternalMenuDsl.g:5716:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
+    // InternalMenuDsl.g:5847: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 {
-            // InternalMenuDsl.g:5720:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
-            // InternalMenuDsl.g:5721:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalMenuDsl.g:5851:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
+            // InternalMenuDsl.g:5852:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
             {
-            // InternalMenuDsl.g:5721:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
-            // InternalMenuDsl.g:5722:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalMenuDsl.g:5852:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalMenuDsl.g:5853:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
             {
-            // InternalMenuDsl.g:5722:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
-            // InternalMenuDsl.g:5723:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalMenuDsl.g:5853:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
+            // InternalMenuDsl.g:5854:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // InternalMenuDsl.g:5724:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
-            // InternalMenuDsl.g:5724:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            // InternalMenuDsl.g:5855:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalMenuDsl.g:5855:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_28);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             state._fsp--;
@@ -20258,28 +20689,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // InternalMenuDsl.g:5727:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
-            // InternalMenuDsl.g:5728:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            // InternalMenuDsl.g:5858:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalMenuDsl.g:5859:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // InternalMenuDsl.g:5729:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
-            loop69:
+            // InternalMenuDsl.g:5860:3: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            loop67:
             do {
-                int alt69=2;
-                int LA69_0 = input.LA(1);
+                int alt67=2;
+                int LA67_0 = input.LA(1);
 
-                if ( (LA69_0==63) ) {
-                    alt69=1;
+                if ( (LA67_0==65) ) {
+                    alt67=1;
                 }
 
 
-                switch (alt69) {
+                switch (alt67) {
             	case 1 :
-            	    // InternalMenuDsl.g:5729:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            	    // InternalMenuDsl.g:5860:4: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             	    state._fsp--;
@@ -20289,7 +20720,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop69;
+            	    break loop67;
                 }
             } while (true);
 
@@ -20321,16 +20752,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0"
-    // InternalMenuDsl.g:5739:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
+    // InternalMenuDsl.g:5870: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 {
-            // InternalMenuDsl.g:5743:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
-            // InternalMenuDsl.g:5744:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
+            // InternalMenuDsl.g:5874:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
+            // InternalMenuDsl.g:5875:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl();
 
             state._fsp--;
@@ -20359,22 +20790,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl"
-    // InternalMenuDsl.g:5751:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:5882: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 {
-            // InternalMenuDsl.g:5755:1: ( ( ',' ) )
-            // InternalMenuDsl.g:5756:1: ( ',' )
+            // InternalMenuDsl.g:5886:1: ( ( ',' ) )
+            // InternalMenuDsl.g:5887:1: ( ',' )
             {
-            // InternalMenuDsl.g:5756:1: ( ',' )
-            // InternalMenuDsl.g:5757:2: ','
+            // InternalMenuDsl.g:5887:1: ( ',' )
+            // InternalMenuDsl.g:5888:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
@@ -20400,14 +20831,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1"
-    // InternalMenuDsl.g:5766:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
+    // InternalMenuDsl.g:5897: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 {
-            // InternalMenuDsl.g:5770:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
-            // InternalMenuDsl.g:5771:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
+            // InternalMenuDsl.g:5901:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
+            // InternalMenuDsl.g:5902:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl();
@@ -20433,23 +20864,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl"
-    // InternalMenuDsl.g:5777:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
+    // InternalMenuDsl.g:5908: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 {
-            // InternalMenuDsl.g:5781:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
-            // InternalMenuDsl.g:5782:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalMenuDsl.g:5912:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
+            // InternalMenuDsl.g:5913:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
             {
-            // InternalMenuDsl.g:5782:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
-            // InternalMenuDsl.g:5783:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalMenuDsl.g:5913:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalMenuDsl.g:5914:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_1_1_1_1()); 
             }
-            // InternalMenuDsl.g:5784:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
-            // InternalMenuDsl.g:5784:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
+            // InternalMenuDsl.g:5915:2: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalMenuDsl.g:5915:3: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1();
@@ -20484,16 +20915,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0"
-    // InternalMenuDsl.g:5793:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
+    // InternalMenuDsl.g:5924: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 {
-            // InternalMenuDsl.g:5797:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
-            // InternalMenuDsl.g:5798:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
+            // InternalMenuDsl.g:5928:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
+            // InternalMenuDsl.g:5929:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__XAnnotationElementValue__Group_0__0__Impl();
 
             state._fsp--;
@@ -20522,23 +20953,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0__Impl"
-    // InternalMenuDsl.g:5805:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
+    // InternalMenuDsl.g:5936: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 {
-            // InternalMenuDsl.g:5809:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
-            // InternalMenuDsl.g:5810:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalMenuDsl.g:5940:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
+            // InternalMenuDsl.g:5941:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
             {
-            // InternalMenuDsl.g:5810:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
-            // InternalMenuDsl.g:5811:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalMenuDsl.g:5941:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalMenuDsl.g:5942:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0()); 
             }
-            // InternalMenuDsl.g:5812:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
-            // InternalMenuDsl.g:5812:3: rule__XAnnotationElementValue__Group_0_0__0
+            // InternalMenuDsl.g:5943:2: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalMenuDsl.g:5943:3: rule__XAnnotationElementValue__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0();
@@ -20573,16 +21004,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1"
-    // InternalMenuDsl.g:5820:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
+    // InternalMenuDsl.g:5951: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 {
-            // InternalMenuDsl.g:5824:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
-            // InternalMenuDsl.g:5825:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
+            // InternalMenuDsl.g:5955:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
+            // InternalMenuDsl.g:5956:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__XAnnotationElementValue__Group_0__1__Impl();
 
             state._fsp--;
@@ -20611,31 +21042,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1__Impl"
-    // InternalMenuDsl.g:5832:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
+    // InternalMenuDsl.g:5963: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 {
-            // InternalMenuDsl.g:5836:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
-            // InternalMenuDsl.g:5837:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalMenuDsl.g:5967:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
+            // InternalMenuDsl.g:5968:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
             {
-            // InternalMenuDsl.g:5837:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
-            // InternalMenuDsl.g:5838:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            // InternalMenuDsl.g:5968:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalMenuDsl.g:5969:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1()); 
             }
-            // InternalMenuDsl.g:5839:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
-            int alt70=2;
-            int LA70_0 = input.LA(1);
+            // InternalMenuDsl.g:5970:2: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            int alt68=2;
+            int LA68_0 = input.LA(1);
 
-            if ( ((LA70_0>=RULE_STRING && LA70_0<=RULE_DECIMAL)||LA70_0==27||(LA70_0>=34 && LA70_0<=35)||LA70_0==40||(LA70_0>=45 && LA70_0<=50)||LA70_0==52||(LA70_0>=60 && LA70_0<=61)||(LA70_0>=65 && LA70_0<=66)||LA70_0==69||LA70_0==71||(LA70_0>=75 && LA70_0<=83)||LA70_0==85||LA70_0==105) ) {
-                alt70=1;
+            if ( ((LA68_0>=RULE_STRING && LA68_0<=RULE_DECIMAL)||LA68_0==27||(LA68_0>=34 && LA68_0<=35)||LA68_0==40||(LA68_0>=45 && LA68_0<=50)||LA68_0==57||(LA68_0>=62 && LA68_0<=63)||(LA68_0>=67 && LA68_0<=68)||LA68_0==71||LA68_0==73||(LA68_0>=77 && LA68_0<=85)||LA68_0==87||LA68_0==107) ) {
+                alt68=1;
             }
-            switch (alt70) {
+            switch (alt68) {
                 case 1 :
-                    // InternalMenuDsl.g:5839:3: rule__XAnnotationElementValue__Group_0_1__0
+                    // InternalMenuDsl.g:5970:3: rule__XAnnotationElementValue__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValue__Group_0_1__0();
@@ -20673,14 +21104,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2"
-    // InternalMenuDsl.g:5847:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
+    // InternalMenuDsl.g:5978: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 {
-            // InternalMenuDsl.g:5851:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
-            // InternalMenuDsl.g:5852:2: rule__XAnnotationElementValue__Group_0__2__Impl
+            // InternalMenuDsl.g:5982:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
+            // InternalMenuDsl.g:5983:2: rule__XAnnotationElementValue__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__2__Impl();
@@ -20706,22 +21137,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2__Impl"
-    // InternalMenuDsl.g:5858:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
+    // InternalMenuDsl.g:5989:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:5862:1: ( ( ']' ) )
-            // InternalMenuDsl.g:5863:1: ( ']' )
+            // InternalMenuDsl.g:5993:1: ( ( ']' ) )
+            // InternalMenuDsl.g:5994:1: ( ']' )
             {
-            // InternalMenuDsl.g:5863:1: ( ']' )
-            // InternalMenuDsl.g:5864:2: ']'
+            // InternalMenuDsl.g:5994:1: ( ']' )
+            // InternalMenuDsl.g:5995:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,64,FOLLOW_2); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -20747,14 +21178,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0"
-    // InternalMenuDsl.g:5874:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
+    // InternalMenuDsl.g:6005: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 {
-            // InternalMenuDsl.g:5878:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
-            // InternalMenuDsl.g:5879:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
+            // InternalMenuDsl.g:6009:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
+            // InternalMenuDsl.g:6010:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0__Impl();
@@ -20780,23 +21211,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0__Impl"
-    // InternalMenuDsl.g:5885:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
+    // InternalMenuDsl.g:6016: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 {
-            // InternalMenuDsl.g:5889:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
-            // InternalMenuDsl.g:5890:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalMenuDsl.g:6020:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
+            // InternalMenuDsl.g:6021:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
             {
-            // InternalMenuDsl.g:5890:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
-            // InternalMenuDsl.g:5891:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalMenuDsl.g:6021:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalMenuDsl.g:6022:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0_0()); 
             }
-            // InternalMenuDsl.g:5892:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
-            // InternalMenuDsl.g:5892:3: rule__XAnnotationElementValue__Group_0_0_0__0
+            // InternalMenuDsl.g:6023:2: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalMenuDsl.g:6023:3: rule__XAnnotationElementValue__Group_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__0();
@@ -20831,16 +21262,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0"
-    // InternalMenuDsl.g:5901:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
+    // InternalMenuDsl.g:6032: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 {
-            // InternalMenuDsl.g:5905:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
-            // InternalMenuDsl.g:5906:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
+            // InternalMenuDsl.g:6036:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
+            // InternalMenuDsl.g:6037:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_32);
             rule__XAnnotationElementValue__Group_0_0_0__0__Impl();
 
             state._fsp--;
@@ -20869,23 +21300,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0__Impl"
-    // InternalMenuDsl.g:5913:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:6044: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 {
-            // InternalMenuDsl.g:5917:1: ( ( () ) )
-            // InternalMenuDsl.g:5918:1: ( () )
+            // InternalMenuDsl.g:6048:1: ( ( () ) )
+            // InternalMenuDsl.g:6049:1: ( () )
             {
-            // InternalMenuDsl.g:5918:1: ( () )
-            // InternalMenuDsl.g:5919:2: ()
+            // InternalMenuDsl.g:6049:1: ( () )
+            // InternalMenuDsl.g:6050:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // InternalMenuDsl.g:5920:2: ()
-            // InternalMenuDsl.g:5920:3: 
+            // InternalMenuDsl.g:6051:2: ()
+            // InternalMenuDsl.g:6051:3: 
             {
             }
 
@@ -20910,16 +21341,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1"
-    // InternalMenuDsl.g:5928:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
+    // InternalMenuDsl.g:6059: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 {
-            // InternalMenuDsl.g:5932:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
-            // InternalMenuDsl.g:5933:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
+            // InternalMenuDsl.g:6063:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
+            // InternalMenuDsl.g:6064:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__XAnnotationElementValue__Group_0_0_0__1__Impl();
 
             state._fsp--;
@@ -20948,22 +21379,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1__Impl"
-    // InternalMenuDsl.g:5940:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalMenuDsl.g:6071: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 {
-            // InternalMenuDsl.g:5944:1: ( ( '#' ) )
-            // InternalMenuDsl.g:5945:1: ( '#' )
+            // InternalMenuDsl.g:6075:1: ( ( '#' ) )
+            // InternalMenuDsl.g:6076:1: ( '#' )
             {
-            // InternalMenuDsl.g:5945:1: ( '#' )
-            // InternalMenuDsl.g:5946:2: '#'
+            // InternalMenuDsl.g:6076:1: ( '#' )
+            // InternalMenuDsl.g:6077:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,65,FOLLOW_2); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -20989,14 +21420,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2"
-    // InternalMenuDsl.g:5955:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
+    // InternalMenuDsl.g:6086: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 {
-            // InternalMenuDsl.g:5959:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
-            // InternalMenuDsl.g:5960:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
+            // InternalMenuDsl.g:6090:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
+            // InternalMenuDsl.g:6091:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__2__Impl();
@@ -21022,22 +21453,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2__Impl"
-    // InternalMenuDsl.g:5966:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalMenuDsl.g:6097: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 {
-            // InternalMenuDsl.g:5970:1: ( ( '[' ) )
-            // InternalMenuDsl.g:5971:1: ( '[' )
+            // InternalMenuDsl.g:6101:1: ( ( '[' ) )
+            // InternalMenuDsl.g:6102:1: ( '[' )
             {
-            // InternalMenuDsl.g:5971:1: ( '[' )
-            // InternalMenuDsl.g:5972:2: '['
+            // InternalMenuDsl.g:6102:1: ( '[' )
+            // InternalMenuDsl.g:6103:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,66,FOLLOW_2); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -21063,16 +21494,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0"
-    // InternalMenuDsl.g:5982:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
+    // InternalMenuDsl.g:6113: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 {
-            // InternalMenuDsl.g:5986:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
-            // InternalMenuDsl.g:5987:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
+            // InternalMenuDsl.g:6117:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
+            // InternalMenuDsl.g:6118:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XAnnotationElementValue__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -21101,23 +21532,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0__Impl"
-    // InternalMenuDsl.g:5994:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
+    // InternalMenuDsl.g:6125: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 {
-            // InternalMenuDsl.g:5998:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
-            // InternalMenuDsl.g:5999:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalMenuDsl.g:6129:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
+            // InternalMenuDsl.g:6130:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
             {
-            // InternalMenuDsl.g:5999:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
-            // InternalMenuDsl.g:6000:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalMenuDsl.g:6130:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalMenuDsl.g:6131:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_0()); 
             }
-            // InternalMenuDsl.g:6001:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
-            // InternalMenuDsl.g:6001:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
+            // InternalMenuDsl.g:6132:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalMenuDsl.g:6132:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_0();
@@ -21152,14 +21583,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1"
-    // InternalMenuDsl.g:6009:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
+    // InternalMenuDsl.g:6140: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 {
-            // InternalMenuDsl.g:6013:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
-            // InternalMenuDsl.g:6014:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
+            // InternalMenuDsl.g:6144:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
+            // InternalMenuDsl.g:6145:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1__1__Impl();
@@ -21185,37 +21616,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1__Impl"
-    // InternalMenuDsl.g:6020:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
+    // InternalMenuDsl.g:6151: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 {
-            // InternalMenuDsl.g:6024:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
-            // InternalMenuDsl.g:6025:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalMenuDsl.g:6155:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
+            // InternalMenuDsl.g:6156:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
             {
-            // InternalMenuDsl.g:6025:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
-            // InternalMenuDsl.g:6026:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            // InternalMenuDsl.g:6156:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalMenuDsl.g:6157:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1_1()); 
             }
-            // InternalMenuDsl.g:6027:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
-            loop71:
+            // InternalMenuDsl.g:6158:2: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            loop69:
             do {
-                int alt71=2;
-                int LA71_0 = input.LA(1);
+                int alt69=2;
+                int LA69_0 = input.LA(1);
 
-                if ( (LA71_0==63) ) {
-                    alt71=1;
+                if ( (LA69_0==65) ) {
+                    alt69=1;
                 }
 
 
-                switch (alt71) {
+                switch (alt69) {
             	case 1 :
-            	    // InternalMenuDsl.g:6027:3: rule__XAnnotationElementValue__Group_0_1_1__0
+            	    // InternalMenuDsl.g:6158:3: rule__XAnnotationElementValue__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XAnnotationElementValue__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -21225,7 +21656,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop71;
+            	    break loop69;
                 }
             } while (true);
 
@@ -21254,16 +21685,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0"
-    // InternalMenuDsl.g:6036:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
+    // InternalMenuDsl.g:6167: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 {
-            // InternalMenuDsl.g:6040:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
-            // InternalMenuDsl.g:6041:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
+            // InternalMenuDsl.g:6171:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
+            // InternalMenuDsl.g:6172:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAnnotationElementValue__Group_0_1_1__0__Impl();
 
             state._fsp--;
@@ -21292,22 +21723,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0__Impl"
-    // InternalMenuDsl.g:6048:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:6179: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 {
-            // InternalMenuDsl.g:6052:1: ( ( ',' ) )
-            // InternalMenuDsl.g:6053:1: ( ',' )
+            // InternalMenuDsl.g:6183:1: ( ( ',' ) )
+            // InternalMenuDsl.g:6184:1: ( ',' )
             {
-            // InternalMenuDsl.g:6053:1: ( ',' )
-            // InternalMenuDsl.g:6054:2: ','
+            // InternalMenuDsl.g:6184:1: ( ',' )
+            // InternalMenuDsl.g:6185:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -21333,14 +21764,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1"
-    // InternalMenuDsl.g:6063:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
+    // InternalMenuDsl.g:6194: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 {
-            // InternalMenuDsl.g:6067:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
-            // InternalMenuDsl.g:6068:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
+            // InternalMenuDsl.g:6198:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
+            // InternalMenuDsl.g:6199:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1_1__1__Impl();
@@ -21366,23 +21797,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1__Impl"
-    // InternalMenuDsl.g:6074:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalMenuDsl.g:6205: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 {
-            // InternalMenuDsl.g:6078:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
-            // InternalMenuDsl.g:6079:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalMenuDsl.g:6209:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalMenuDsl.g:6210:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
             {
-            // InternalMenuDsl.g:6079:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
-            // InternalMenuDsl.g:6080:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalMenuDsl.g:6210:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalMenuDsl.g:6211:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // InternalMenuDsl.g:6081:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
-            // InternalMenuDsl.g:6081:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
+            // InternalMenuDsl.g:6212:2: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalMenuDsl.g:6212:3: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1();
@@ -21417,16 +21848,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0"
-    // InternalMenuDsl.g:6090:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
+    // InternalMenuDsl.g:6221: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 {
-            // InternalMenuDsl.g:6094:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
-            // InternalMenuDsl.g:6095:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
+            // InternalMenuDsl.g:6225:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
+            // InternalMenuDsl.g:6226:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
             {
-            pushFollow(FOLLOW_32);
+            pushFollow(FOLLOW_34);
             rule__XAssignment__Group_0__0__Impl();
 
             state._fsp--;
@@ -21455,23 +21886,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0__Impl"
-    // InternalMenuDsl.g:6102:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:6233:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6106:1: ( ( () ) )
-            // InternalMenuDsl.g:6107:1: ( () )
+            // InternalMenuDsl.g:6237:1: ( ( () ) )
+            // InternalMenuDsl.g:6238:1: ( () )
             {
-            // InternalMenuDsl.g:6107:1: ( () )
-            // InternalMenuDsl.g:6108:2: ()
+            // InternalMenuDsl.g:6238:1: ( () )
+            // InternalMenuDsl.g:6239:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXAssignmentAction_0_0()); 
             }
-            // InternalMenuDsl.g:6109:2: ()
-            // InternalMenuDsl.g:6109:3: 
+            // InternalMenuDsl.g:6240:2: ()
+            // InternalMenuDsl.g:6240:3: 
             {
             }
 
@@ -21496,16 +21927,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1"
-    // InternalMenuDsl.g:6117:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
+    // InternalMenuDsl.g:6248: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 {
-            // InternalMenuDsl.g:6121:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
-            // InternalMenuDsl.g:6122:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
+            // InternalMenuDsl.g:6252:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
+            // InternalMenuDsl.g:6253:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__XAssignment__Group_0__1__Impl();
 
             state._fsp--;
@@ -21534,23 +21965,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1__Impl"
-    // InternalMenuDsl.g:6129:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
+    // InternalMenuDsl.g:6260: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 {
-            // InternalMenuDsl.g:6133:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
-            // InternalMenuDsl.g:6134:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalMenuDsl.g:6264:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
+            // InternalMenuDsl.g:6265:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
             {
-            // InternalMenuDsl.g:6134:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
-            // InternalMenuDsl.g:6135:2: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalMenuDsl.g:6265:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalMenuDsl.g:6266:2: ( rule__XAssignment__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_0_1()); 
             }
-            // InternalMenuDsl.g:6136:2: ( rule__XAssignment__FeatureAssignment_0_1 )
-            // InternalMenuDsl.g:6136:3: rule__XAssignment__FeatureAssignment_0_1
+            // InternalMenuDsl.g:6267:2: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalMenuDsl.g:6267:3: rule__XAssignment__FeatureAssignment_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_0_1();
@@ -21585,16 +22016,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2"
-    // InternalMenuDsl.g:6144:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
+    // InternalMenuDsl.g:6275: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 {
-            // InternalMenuDsl.g:6148:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
-            // InternalMenuDsl.g:6149:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
+            // InternalMenuDsl.g:6279:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
+            // InternalMenuDsl.g:6280:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAssignment__Group_0__2__Impl();
 
             state._fsp--;
@@ -21623,17 +22054,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2__Impl"
-    // InternalMenuDsl.g:6156:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
+    // InternalMenuDsl.g:6287:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6160:1: ( ( ruleOpSingleAssign ) )
-            // InternalMenuDsl.g:6161:1: ( ruleOpSingleAssign )
+            // InternalMenuDsl.g:6291:1: ( ( ruleOpSingleAssign ) )
+            // InternalMenuDsl.g:6292:1: ( ruleOpSingleAssign )
             {
-            // InternalMenuDsl.g:6161:1: ( ruleOpSingleAssign )
-            // InternalMenuDsl.g:6162:2: ruleOpSingleAssign
+            // InternalMenuDsl.g:6292:1: ( ruleOpSingleAssign )
+            // InternalMenuDsl.g:6293:2: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
@@ -21668,14 +22099,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3"
-    // InternalMenuDsl.g:6171:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
+    // InternalMenuDsl.g:6302: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 {
-            // InternalMenuDsl.g:6175:1: ( rule__XAssignment__Group_0__3__Impl )
-            // InternalMenuDsl.g:6176:2: rule__XAssignment__Group_0__3__Impl
+            // InternalMenuDsl.g:6306:1: ( rule__XAssignment__Group_0__3__Impl )
+            // InternalMenuDsl.g:6307:2: rule__XAssignment__Group_0__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3__Impl();
@@ -21701,23 +22132,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3__Impl"
-    // InternalMenuDsl.g:6182:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
+    // InternalMenuDsl.g:6313: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 {
-            // InternalMenuDsl.g:6186:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
-            // InternalMenuDsl.g:6187:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalMenuDsl.g:6317:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
+            // InternalMenuDsl.g:6318:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
             {
-            // InternalMenuDsl.g:6187:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
-            // InternalMenuDsl.g:6188:2: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalMenuDsl.g:6318:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalMenuDsl.g:6319:2: ( rule__XAssignment__ValueAssignment_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueAssignment_0_3()); 
             }
-            // InternalMenuDsl.g:6189:2: ( rule__XAssignment__ValueAssignment_0_3 )
-            // InternalMenuDsl.g:6189:3: rule__XAssignment__ValueAssignment_0_3
+            // InternalMenuDsl.g:6320:2: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalMenuDsl.g:6320:3: rule__XAssignment__ValueAssignment_0_3
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__ValueAssignment_0_3();
@@ -21752,16 +22183,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0"
-    // InternalMenuDsl.g:6198:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
+    // InternalMenuDsl.g:6329: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 {
-            // InternalMenuDsl.g:6202:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
-            // InternalMenuDsl.g:6203:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
+            // InternalMenuDsl.g:6333:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
+            // InternalMenuDsl.g:6334:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
             {
-            pushFollow(FOLLOW_33);
+            pushFollow(FOLLOW_35);
             rule__XAssignment__Group_1__0__Impl();
 
             state._fsp--;
@@ -21790,17 +22221,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0__Impl"
-    // InternalMenuDsl.g:6210:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
+    // InternalMenuDsl.g:6341:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
     public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6214:1: ( ( ruleXOrExpression ) )
-            // InternalMenuDsl.g:6215:1: ( ruleXOrExpression )
+            // InternalMenuDsl.g:6345:1: ( ( ruleXOrExpression ) )
+            // InternalMenuDsl.g:6346:1: ( ruleXOrExpression )
             {
-            // InternalMenuDsl.g:6215:1: ( ruleXOrExpression )
-            // InternalMenuDsl.g:6216:2: ruleXOrExpression
+            // InternalMenuDsl.g:6346:1: ( ruleXOrExpression )
+            // InternalMenuDsl.g:6347:2: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
@@ -21835,14 +22266,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1"
-    // InternalMenuDsl.g:6225:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
+    // InternalMenuDsl.g:6356: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 {
-            // InternalMenuDsl.g:6229:1: ( rule__XAssignment__Group_1__1__Impl )
-            // InternalMenuDsl.g:6230:2: rule__XAssignment__Group_1__1__Impl
+            // InternalMenuDsl.g:6360:1: ( rule__XAssignment__Group_1__1__Impl )
+            // InternalMenuDsl.g:6361:2: rule__XAssignment__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1__Impl();
@@ -21868,27 +22299,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1__Impl"
-    // InternalMenuDsl.g:6236:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
+    // InternalMenuDsl.g:6367: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 {
-            // InternalMenuDsl.g:6240:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
-            // InternalMenuDsl.g:6241:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalMenuDsl.g:6371:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
+            // InternalMenuDsl.g:6372:1: ( ( rule__XAssignment__Group_1_1__0 )? )
             {
-            // InternalMenuDsl.g:6241:1: ( ( rule__XAssignment__Group_1_1__0 )? )
-            // InternalMenuDsl.g:6242:2: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalMenuDsl.g:6372:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalMenuDsl.g:6373:2: ( rule__XAssignment__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1()); 
             }
-            // InternalMenuDsl.g:6243:2: ( rule__XAssignment__Group_1_1__0 )?
-            int alt72=2;
-            alt72 = dfa72.predict(input);
-            switch (alt72) {
+            // InternalMenuDsl.g:6374:2: ( rule__XAssignment__Group_1_1__0 )?
+            int alt70=2;
+            alt70 = dfa70.predict(input);
+            switch (alt70) {
                 case 1 :
-                    // InternalMenuDsl.g:6243:3: rule__XAssignment__Group_1_1__0
+                    // InternalMenuDsl.g:6374:3: rule__XAssignment__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1_1__0();
@@ -21926,16 +22357,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0"
-    // InternalMenuDsl.g:6252:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
+    // InternalMenuDsl.g:6383: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 {
-            // InternalMenuDsl.g:6256:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
-            // InternalMenuDsl.g:6257:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
+            // InternalMenuDsl.g:6387:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
+            // InternalMenuDsl.g:6388:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAssignment__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -21964,23 +22395,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0__Impl"
-    // InternalMenuDsl.g:6264:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
+    // InternalMenuDsl.g:6395: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 {
-            // InternalMenuDsl.g:6268:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
-            // InternalMenuDsl.g:6269:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalMenuDsl.g:6399:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
+            // InternalMenuDsl.g:6400:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
             {
-            // InternalMenuDsl.g:6269:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
-            // InternalMenuDsl.g:6270:2: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalMenuDsl.g:6400:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalMenuDsl.g:6401:2: ( rule__XAssignment__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0()); 
             }
-            // InternalMenuDsl.g:6271:2: ( rule__XAssignment__Group_1_1_0__0 )
-            // InternalMenuDsl.g:6271:3: rule__XAssignment__Group_1_1_0__0
+            // InternalMenuDsl.g:6402:2: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalMenuDsl.g:6402:3: rule__XAssignment__Group_1_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0();
@@ -22015,14 +22446,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1"
-    // InternalMenuDsl.g:6279:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
+    // InternalMenuDsl.g:6410: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 {
-            // InternalMenuDsl.g:6283:1: ( rule__XAssignment__Group_1_1__1__Impl )
-            // InternalMenuDsl.g:6284:2: rule__XAssignment__Group_1_1__1__Impl
+            // InternalMenuDsl.g:6414:1: ( rule__XAssignment__Group_1_1__1__Impl )
+            // InternalMenuDsl.g:6415:2: rule__XAssignment__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1__Impl();
@@ -22048,23 +22479,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1__Impl"
-    // InternalMenuDsl.g:6290:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalMenuDsl.g:6421: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 {
-            // InternalMenuDsl.g:6294:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
-            // InternalMenuDsl.g:6295:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalMenuDsl.g:6425:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
+            // InternalMenuDsl.g:6426:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
             {
-            // InternalMenuDsl.g:6295:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
-            // InternalMenuDsl.g:6296:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalMenuDsl.g:6426:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalMenuDsl.g:6427:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // InternalMenuDsl.g:6297:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
-            // InternalMenuDsl.g:6297:3: rule__XAssignment__RightOperandAssignment_1_1_1
+            // InternalMenuDsl.g:6428:2: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalMenuDsl.g:6428:3: rule__XAssignment__RightOperandAssignment_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__RightOperandAssignment_1_1_1();
@@ -22099,14 +22530,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0"
-    // InternalMenuDsl.g:6306:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
+    // InternalMenuDsl.g:6437: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 {
-            // InternalMenuDsl.g:6310:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
-            // InternalMenuDsl.g:6311:2: rule__XAssignment__Group_1_1_0__0__Impl
+            // InternalMenuDsl.g:6441:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
+            // InternalMenuDsl.g:6442:2: rule__XAssignment__Group_1_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0__Impl();
@@ -22132,23 +22563,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0__Impl"
-    // InternalMenuDsl.g:6317:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:6448: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 {
-            // InternalMenuDsl.g:6321:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:6322:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalMenuDsl.g:6452:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:6453:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:6322:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
-            // InternalMenuDsl.g:6323:2: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalMenuDsl.g:6453:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalMenuDsl.g:6454:2: ( rule__XAssignment__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0_0()); 
             }
-            // InternalMenuDsl.g:6324:2: ( rule__XAssignment__Group_1_1_0_0__0 )
-            // InternalMenuDsl.g:6324:3: rule__XAssignment__Group_1_1_0_0__0
+            // InternalMenuDsl.g:6455:2: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalMenuDsl.g:6455:3: rule__XAssignment__Group_1_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__0();
@@ -22183,16 +22614,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0"
-    // InternalMenuDsl.g:6333: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 ;
+    // InternalMenuDsl.g:6464: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 {
-            // InternalMenuDsl.g:6337:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
-            // InternalMenuDsl.g:6338:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
+            // InternalMenuDsl.g:6468:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
+            // InternalMenuDsl.g:6469:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_33);
+            pushFollow(FOLLOW_35);
             rule__XAssignment__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
@@ -22221,23 +22652,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0__Impl"
-    // InternalMenuDsl.g:6345:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:6476: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 {
-            // InternalMenuDsl.g:6349:1: ( ( () ) )
-            // InternalMenuDsl.g:6350:1: ( () )
+            // InternalMenuDsl.g:6480:1: ( ( () ) )
+            // InternalMenuDsl.g:6481:1: ( () )
             {
-            // InternalMenuDsl.g:6350:1: ( () )
-            // InternalMenuDsl.g:6351:2: ()
+            // InternalMenuDsl.g:6481:1: ( () )
+            // InternalMenuDsl.g:6482:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:6352:2: ()
-            // InternalMenuDsl.g:6352:3: 
+            // InternalMenuDsl.g:6483:2: ()
+            // InternalMenuDsl.g:6483:3: 
             {
             }
 
@@ -22262,14 +22693,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1"
-    // InternalMenuDsl.g:6360:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:6491: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 {
-            // InternalMenuDsl.g:6364:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
-            // InternalMenuDsl.g:6365:2: rule__XAssignment__Group_1_1_0_0__1__Impl
+            // InternalMenuDsl.g:6495:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
+            // InternalMenuDsl.g:6496:2: rule__XAssignment__Group_1_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1__Impl();
@@ -22295,23 +22726,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1__Impl"
-    // InternalMenuDsl.g:6371:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:6502: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 {
-            // InternalMenuDsl.g:6375:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:6376:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalMenuDsl.g:6506:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:6507:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:6376:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
-            // InternalMenuDsl.g:6377:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalMenuDsl.g:6507:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalMenuDsl.g:6508:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:6378:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
-            // InternalMenuDsl.g:6378:3: rule__XAssignment__FeatureAssignment_1_1_0_0_1
+            // InternalMenuDsl.g:6509:2: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalMenuDsl.g:6509:3: rule__XAssignment__FeatureAssignment_1_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_1_1_0_0_1();
@@ -22346,16 +22777,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0"
-    // InternalMenuDsl.g:6387:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
+    // InternalMenuDsl.g:6518: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 {
-            // InternalMenuDsl.g:6391:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
-            // InternalMenuDsl.g:6392:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
+            // InternalMenuDsl.g:6522:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
+            // InternalMenuDsl.g:6523:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
             {
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_36);
             rule__OpMultiAssign__Group_5__0__Impl();
 
             state._fsp--;
@@ -22384,17 +22815,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0__Impl"
-    // InternalMenuDsl.g:6399:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:6530:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6403:1: ( ( '<' ) )
-            // InternalMenuDsl.g:6404:1: ( '<' )
+            // InternalMenuDsl.g:6534:1: ( ( '<' ) )
+            // InternalMenuDsl.g:6535:1: ( '<' )
             {
-            // InternalMenuDsl.g:6404:1: ( '<' )
-            // InternalMenuDsl.g:6405:2: '<'
+            // InternalMenuDsl.g:6535:1: ( '<' )
+            // InternalMenuDsl.g:6536:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
@@ -22425,16 +22856,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1"
-    // InternalMenuDsl.g:6414:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
+    // InternalMenuDsl.g:6545: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 {
-            // InternalMenuDsl.g:6418:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
-            // InternalMenuDsl.g:6419:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
+            // InternalMenuDsl.g:6549:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
+            // InternalMenuDsl.g:6550:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__OpMultiAssign__Group_5__1__Impl();
 
             state._fsp--;
@@ -22463,17 +22894,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1__Impl"
-    // InternalMenuDsl.g:6426:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:6557:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6430:1: ( ( '<' ) )
-            // InternalMenuDsl.g:6431:1: ( '<' )
+            // InternalMenuDsl.g:6561:1: ( ( '<' ) )
+            // InternalMenuDsl.g:6562:1: ( '<' )
             {
-            // InternalMenuDsl.g:6431:1: ( '<' )
-            // InternalMenuDsl.g:6432:2: '<'
+            // InternalMenuDsl.g:6562:1: ( '<' )
+            // InternalMenuDsl.g:6563:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
@@ -22504,14 +22935,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2"
-    // InternalMenuDsl.g:6441:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
+    // InternalMenuDsl.g:6572: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 {
-            // InternalMenuDsl.g:6445:1: ( rule__OpMultiAssign__Group_5__2__Impl )
-            // InternalMenuDsl.g:6446:2: rule__OpMultiAssign__Group_5__2__Impl
+            // InternalMenuDsl.g:6576:1: ( rule__OpMultiAssign__Group_5__2__Impl )
+            // InternalMenuDsl.g:6577:2: rule__OpMultiAssign__Group_5__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2__Impl();
@@ -22537,17 +22968,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2__Impl"
-    // InternalMenuDsl.g:6452:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
+    // InternalMenuDsl.g:6583:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
     public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6456:1: ( ( '=' ) )
-            // InternalMenuDsl.g:6457:1: ( '=' )
+            // InternalMenuDsl.g:6587:1: ( ( '=' ) )
+            // InternalMenuDsl.g:6588:1: ( '=' )
             {
-            // InternalMenuDsl.g:6457:1: ( '=' )
-            // InternalMenuDsl.g:6458:2: '='
+            // InternalMenuDsl.g:6588:1: ( '=' )
+            // InternalMenuDsl.g:6589:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
@@ -22578,16 +23009,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0"
-    // InternalMenuDsl.g:6468:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
+    // InternalMenuDsl.g:6599: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 {
-            // InternalMenuDsl.g:6472:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
-            // InternalMenuDsl.g:6473:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
+            // InternalMenuDsl.g:6603:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
+            // InternalMenuDsl.g:6604:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
             {
-            pushFollow(FOLLOW_35);
+            pushFollow(FOLLOW_37);
             rule__OpMultiAssign__Group_6__0__Impl();
 
             state._fsp--;
@@ -22616,17 +23047,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0__Impl"
-    // InternalMenuDsl.g:6480:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:6611:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
     public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6484:1: ( ( '>' ) )
-            // InternalMenuDsl.g:6485:1: ( '>' )
+            // InternalMenuDsl.g:6615:1: ( ( '>' ) )
+            // InternalMenuDsl.g:6616:1: ( '>' )
             {
-            // InternalMenuDsl.g:6485:1: ( '>' )
-            // InternalMenuDsl.g:6486:2: '>'
+            // InternalMenuDsl.g:6616:1: ( '>' )
+            // InternalMenuDsl.g:6617:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
@@ -22657,16 +23088,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1"
-    // InternalMenuDsl.g:6495:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
+    // InternalMenuDsl.g:6626: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 {
-            // InternalMenuDsl.g:6499:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
-            // InternalMenuDsl.g:6500:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
+            // InternalMenuDsl.g:6630:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
+            // InternalMenuDsl.g:6631:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
             {
-            pushFollow(FOLLOW_35);
+            pushFollow(FOLLOW_37);
             rule__OpMultiAssign__Group_6__1__Impl();
 
             state._fsp--;
@@ -22695,31 +23126,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1__Impl"
-    // InternalMenuDsl.g:6507:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
+    // InternalMenuDsl.g:6638:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
     public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6511:1: ( ( ( '>' )? ) )
-            // InternalMenuDsl.g:6512:1: ( ( '>' )? )
+            // InternalMenuDsl.g:6642:1: ( ( ( '>' )? ) )
+            // InternalMenuDsl.g:6643:1: ( ( '>' )? )
             {
-            // InternalMenuDsl.g:6512:1: ( ( '>' )? )
-            // InternalMenuDsl.g:6513:2: ( '>' )?
+            // InternalMenuDsl.g:6643:1: ( ( '>' )? )
+            // InternalMenuDsl.g:6644:2: ( '>' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_1()); 
             }
-            // InternalMenuDsl.g:6514:2: ( '>' )?
-            int alt73=2;
-            int LA73_0 = input.LA(1);
+            // InternalMenuDsl.g:6645:2: ( '>' )?
+            int alt71=2;
+            int LA71_0 = input.LA(1);
 
-            if ( (LA73_0==26) ) {
-                alt73=1;
+            if ( (LA71_0==26) ) {
+                alt71=1;
             }
-            switch (alt73) {
+            switch (alt71) {
                 case 1 :
-                    // InternalMenuDsl.g:6514:3: '>'
+                    // InternalMenuDsl.g:6645:3: '>'
                     {
                     match(input,26,FOLLOW_2); if (state.failed) return ;
 
@@ -22753,14 +23184,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2"
-    // InternalMenuDsl.g:6522:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
+    // InternalMenuDsl.g:6653: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 {
-            // InternalMenuDsl.g:6526:1: ( rule__OpMultiAssign__Group_6__2__Impl )
-            // InternalMenuDsl.g:6527:2: rule__OpMultiAssign__Group_6__2__Impl
+            // InternalMenuDsl.g:6657:1: ( rule__OpMultiAssign__Group_6__2__Impl )
+            // InternalMenuDsl.g:6658:2: rule__OpMultiAssign__Group_6__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2__Impl();
@@ -22786,17 +23217,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2__Impl"
-    // InternalMenuDsl.g:6533:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
+    // InternalMenuDsl.g:6664:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
     public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6537:1: ( ( '>=' ) )
-            // InternalMenuDsl.g:6538:1: ( '>=' )
+            // InternalMenuDsl.g:6668:1: ( ( '>=' ) )
+            // InternalMenuDsl.g:6669:1: ( '>=' )
             {
-            // InternalMenuDsl.g:6538:1: ( '>=' )
-            // InternalMenuDsl.g:6539:2: '>='
+            // InternalMenuDsl.g:6669:1: ( '>=' )
+            // InternalMenuDsl.g:6670:2: '>='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
@@ -22827,16 +23258,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group__0"
-    // InternalMenuDsl.g:6549:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
+    // InternalMenuDsl.g:6680: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 {
-            // InternalMenuDsl.g:6553:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
-            // InternalMenuDsl.g:6554:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
+            // InternalMenuDsl.g:6684:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
+            // InternalMenuDsl.g:6685:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
             {
-            pushFollow(FOLLOW_36);
+            pushFollow(FOLLOW_38);
             rule__XOrExpression__Group__0__Impl();
 
             state._fsp--;
@@ -22865,17 +23296,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group__0__Impl"
-    // InternalMenuDsl.g:6561:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
+    // InternalMenuDsl.g:6692:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6565:1: ( ( ruleXAndExpression ) )
-            // InternalMenuDsl.g:6566:1: ( ruleXAndExpression )
+            // InternalMenuDsl.g:6696:1: ( ( ruleXAndExpression ) )
+            // InternalMenuDsl.g:6697:1: ( ruleXAndExpression )
             {
-            // InternalMenuDsl.g:6566:1: ( ruleXAndExpression )
-            // InternalMenuDsl.g:6567:2: ruleXAndExpression
+            // InternalMenuDsl.g:6697:1: ( ruleXAndExpression )
+            // InternalMenuDsl.g:6698:2: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
@@ -22910,14 +23341,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group__1"
-    // InternalMenuDsl.g:6576:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:6707:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
     public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6580:1: ( rule__XOrExpression__Group__1__Impl )
-            // InternalMenuDsl.g:6581:2: rule__XOrExpression__Group__1__Impl
+            // InternalMenuDsl.g:6711:1: ( rule__XOrExpression__Group__1__Impl )
+            // InternalMenuDsl.g:6712:2: rule__XOrExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1__Impl();
@@ -22943,43 +23374,43 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group__1__Impl"
-    // InternalMenuDsl.g:6587:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:6718: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 {
-            // InternalMenuDsl.g:6591:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
-            // InternalMenuDsl.g:6592:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:6722:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
+            // InternalMenuDsl.g:6723:1: ( ( rule__XOrExpression__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:6592:1: ( ( rule__XOrExpression__Group_1__0 )* )
-            // InternalMenuDsl.g:6593:2: ( rule__XOrExpression__Group_1__0 )*
+            // InternalMenuDsl.g:6723:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:6724:2: ( rule__XOrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:6594:2: ( rule__XOrExpression__Group_1__0 )*
-            loop74:
+            // InternalMenuDsl.g:6725:2: ( rule__XOrExpression__Group_1__0 )*
+            loop72:
             do {
-                int alt74=2;
-                int LA74_0 = input.LA(1);
+                int alt72=2;
+                int LA72_0 = input.LA(1);
 
-                if ( (LA74_0==14) ) {
-                    int LA74_2 = input.LA(2);
+                if ( (LA72_0==14) ) {
+                    int LA72_2 = input.LA(2);
 
-                    if ( (synpred122_InternalMenuDsl()) ) {
-                        alt74=1;
+                    if ( (synpred121_InternalMenuDsl()) ) {
+                        alt72=1;
                     }
 
 
                 }
 
 
-                switch (alt74) {
+                switch (alt72) {
             	case 1 :
-            	    // InternalMenuDsl.g:6594:3: rule__XOrExpression__Group_1__0
+            	    // InternalMenuDsl.g:6725:3: rule__XOrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_37);
+            	    pushFollow(FOLLOW_39);
             	    rule__XOrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -22989,7 +23420,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop74;
+            	    break loop72;
                 }
             } while (true);
 
@@ -23018,16 +23449,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0"
-    // InternalMenuDsl.g:6603:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
+    // InternalMenuDsl.g:6734: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 {
-            // InternalMenuDsl.g:6607:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
-            // InternalMenuDsl.g:6608:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
+            // InternalMenuDsl.g:6738:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
+            // InternalMenuDsl.g:6739:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XOrExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -23056,23 +23487,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0__Impl"
-    // InternalMenuDsl.g:6615:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:6746: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 {
-            // InternalMenuDsl.g:6619:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:6620:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:6750:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:6751:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:6620:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
-            // InternalMenuDsl.g:6621:2: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:6751:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:6752:2: ( rule__XOrExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:6622:2: ( rule__XOrExpression__Group_1_0__0 )
-            // InternalMenuDsl.g:6622:3: rule__XOrExpression__Group_1_0__0
+            // InternalMenuDsl.g:6753:2: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:6753:3: rule__XOrExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0();
@@ -23107,14 +23538,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1"
-    // InternalMenuDsl.g:6630:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
+    // InternalMenuDsl.g:6761: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 {
-            // InternalMenuDsl.g:6634:1: ( rule__XOrExpression__Group_1__1__Impl )
-            // InternalMenuDsl.g:6635:2: rule__XOrExpression__Group_1__1__Impl
+            // InternalMenuDsl.g:6765:1: ( rule__XOrExpression__Group_1__1__Impl )
+            // InternalMenuDsl.g:6766:2: rule__XOrExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1__Impl();
@@ -23140,23 +23571,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1__Impl"
-    // InternalMenuDsl.g:6641:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:6772: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 {
-            // InternalMenuDsl.g:6645:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:6646:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:6776:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:6777:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:6646:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
-            // InternalMenuDsl.g:6647:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:6777:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:6778:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:6648:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
-            // InternalMenuDsl.g:6648:3: rule__XOrExpression__RightOperandAssignment_1_1
+            // InternalMenuDsl.g:6779:2: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:6779:3: rule__XOrExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__RightOperandAssignment_1_1();
@@ -23191,14 +23622,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0"
-    // InternalMenuDsl.g:6657:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
+    // InternalMenuDsl.g:6788: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 {
-            // InternalMenuDsl.g:6661:1: ( rule__XOrExpression__Group_1_0__0__Impl )
-            // InternalMenuDsl.g:6662:2: rule__XOrExpression__Group_1_0__0__Impl
+            // InternalMenuDsl.g:6792:1: ( rule__XOrExpression__Group_1_0__0__Impl )
+            // InternalMenuDsl.g:6793:2: rule__XOrExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0__Impl();
@@ -23224,23 +23655,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:6668:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:6799: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 {
-            // InternalMenuDsl.g:6672:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:6673:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:6803:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:6804:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:6673:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:6674:2: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:6804:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:6805:2: ( rule__XOrExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:6675:2: ( rule__XOrExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:6675:3: rule__XOrExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:6806:2: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:6806:3: rule__XOrExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__0();
@@ -23275,16 +23706,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:6684:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:6815: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 {
-            // InternalMenuDsl.g:6688:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
-            // InternalMenuDsl.g:6689:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
+            // InternalMenuDsl.g:6819:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
+            // InternalMenuDsl.g:6820:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_36);
+            pushFollow(FOLLOW_38);
             rule__XOrExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -23313,23 +23744,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:6696:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:6827: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 {
-            // InternalMenuDsl.g:6700:1: ( ( () ) )
-            // InternalMenuDsl.g:6701:1: ( () )
+            // InternalMenuDsl.g:6831:1: ( ( () ) )
+            // InternalMenuDsl.g:6832:1: ( () )
             {
-            // InternalMenuDsl.g:6701:1: ( () )
-            // InternalMenuDsl.g:6702:2: ()
+            // InternalMenuDsl.g:6832:1: ( () )
+            // InternalMenuDsl.g:6833:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:6703:2: ()
-            // InternalMenuDsl.g:6703:3: 
+            // InternalMenuDsl.g:6834:2: ()
+            // InternalMenuDsl.g:6834:3: 
             {
             }
 
@@ -23354,14 +23785,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1"
-    // InternalMenuDsl.g:6711:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:6842: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 {
-            // InternalMenuDsl.g:6715:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:6716:2: rule__XOrExpression__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:6846:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:6847:2: rule__XOrExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1__Impl();
@@ -23387,23 +23818,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:6722:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:6853: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 {
-            // InternalMenuDsl.g:6726:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:6727:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:6857:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:6858:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:6727:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalMenuDsl.g:6728:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:6858:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:6859:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:6729:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
-            // InternalMenuDsl.g:6729:3: rule__XOrExpression__FeatureAssignment_1_0_0_1
+            // InternalMenuDsl.g:6860:2: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:6860:3: rule__XOrExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XOrExpression__FeatureAssignment_1_0_0_1();
@@ -23438,16 +23869,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group__0"
-    // InternalMenuDsl.g:6738:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
+    // InternalMenuDsl.g:6869: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 {
-            // InternalMenuDsl.g:6742:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
-            // InternalMenuDsl.g:6743:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
+            // InternalMenuDsl.g:6873:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
+            // InternalMenuDsl.g:6874:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
             {
-            pushFollow(FOLLOW_38);
+            pushFollow(FOLLOW_40);
             rule__XAndExpression__Group__0__Impl();
 
             state._fsp--;
@@ -23476,17 +23907,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group__0__Impl"
-    // InternalMenuDsl.g:6750:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
+    // InternalMenuDsl.g:6881:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6754:1: ( ( ruleXEqualityExpression ) )
-            // InternalMenuDsl.g:6755:1: ( ruleXEqualityExpression )
+            // InternalMenuDsl.g:6885:1: ( ( ruleXEqualityExpression ) )
+            // InternalMenuDsl.g:6886:1: ( ruleXEqualityExpression )
             {
-            // InternalMenuDsl.g:6755:1: ( ruleXEqualityExpression )
-            // InternalMenuDsl.g:6756:2: ruleXEqualityExpression
+            // InternalMenuDsl.g:6886:1: ( ruleXEqualityExpression )
+            // InternalMenuDsl.g:6887:2: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
@@ -23521,14 +23952,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group__1"
-    // InternalMenuDsl.g:6765:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:6896:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
     public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6769:1: ( rule__XAndExpression__Group__1__Impl )
-            // InternalMenuDsl.g:6770:2: rule__XAndExpression__Group__1__Impl
+            // InternalMenuDsl.g:6900:1: ( rule__XAndExpression__Group__1__Impl )
+            // InternalMenuDsl.g:6901:2: rule__XAndExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1__Impl();
@@ -23554,43 +23985,43 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group__1__Impl"
-    // InternalMenuDsl.g:6776:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:6907: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 {
-            // InternalMenuDsl.g:6780:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
-            // InternalMenuDsl.g:6781:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:6911:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
+            // InternalMenuDsl.g:6912:1: ( ( rule__XAndExpression__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:6781:1: ( ( rule__XAndExpression__Group_1__0 )* )
-            // InternalMenuDsl.g:6782:2: ( rule__XAndExpression__Group_1__0 )*
+            // InternalMenuDsl.g:6912:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:6913:2: ( rule__XAndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:6783:2: ( rule__XAndExpression__Group_1__0 )*
-            loop75:
+            // InternalMenuDsl.g:6914:2: ( rule__XAndExpression__Group_1__0 )*
+            loop73:
             do {
-                int alt75=2;
-                int LA75_0 = input.LA(1);
+                int alt73=2;
+                int LA73_0 = input.LA(1);
 
-                if ( (LA75_0==15) ) {
-                    int LA75_2 = input.LA(2);
+                if ( (LA73_0==15) ) {
+                    int LA73_2 = input.LA(2);
 
-                    if ( (synpred123_InternalMenuDsl()) ) {
-                        alt75=1;
+                    if ( (synpred122_InternalMenuDsl()) ) {
+                        alt73=1;
                     }
 
 
                 }
 
 
-                switch (alt75) {
+                switch (alt73) {
             	case 1 :
-            	    // InternalMenuDsl.g:6783:3: rule__XAndExpression__Group_1__0
+            	    // InternalMenuDsl.g:6914:3: rule__XAndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_39);
+            	    pushFollow(FOLLOW_41);
             	    rule__XAndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -23600,7 +24031,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop75;
+            	    break loop73;
                 }
             } while (true);
 
@@ -23629,16 +24060,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0"
-    // InternalMenuDsl.g:6792:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
+    // InternalMenuDsl.g:6923: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 {
-            // InternalMenuDsl.g:6796:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
-            // InternalMenuDsl.g:6797:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
+            // InternalMenuDsl.g:6927:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
+            // InternalMenuDsl.g:6928:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAndExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -23667,23 +24098,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0__Impl"
-    // InternalMenuDsl.g:6804:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:6935: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 {
-            // InternalMenuDsl.g:6808:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:6809:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:6939:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:6940:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:6809:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
-            // InternalMenuDsl.g:6810:2: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:6940:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:6941:2: ( rule__XAndExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:6811:2: ( rule__XAndExpression__Group_1_0__0 )
-            // InternalMenuDsl.g:6811:3: rule__XAndExpression__Group_1_0__0
+            // InternalMenuDsl.g:6942:2: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:6942:3: rule__XAndExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0();
@@ -23718,14 +24149,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1"
-    // InternalMenuDsl.g:6819:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
+    // InternalMenuDsl.g:6950: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 {
-            // InternalMenuDsl.g:6823:1: ( rule__XAndExpression__Group_1__1__Impl )
-            // InternalMenuDsl.g:6824:2: rule__XAndExpression__Group_1__1__Impl
+            // InternalMenuDsl.g:6954:1: ( rule__XAndExpression__Group_1__1__Impl )
+            // InternalMenuDsl.g:6955:2: rule__XAndExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1__Impl();
@@ -23751,23 +24182,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1__Impl"
-    // InternalMenuDsl.g:6830:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:6961: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 {
-            // InternalMenuDsl.g:6834:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:6835:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:6965:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:6966:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:6835:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
-            // InternalMenuDsl.g:6836:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:6966:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:6967:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:6837:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
-            // InternalMenuDsl.g:6837:3: rule__XAndExpression__RightOperandAssignment_1_1
+            // InternalMenuDsl.g:6968:2: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:6968:3: rule__XAndExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__RightOperandAssignment_1_1();
@@ -23802,14 +24233,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0"
-    // InternalMenuDsl.g:6846:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
+    // InternalMenuDsl.g:6977: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 {
-            // InternalMenuDsl.g:6850:1: ( rule__XAndExpression__Group_1_0__0__Impl )
-            // InternalMenuDsl.g:6851:2: rule__XAndExpression__Group_1_0__0__Impl
+            // InternalMenuDsl.g:6981:1: ( rule__XAndExpression__Group_1_0__0__Impl )
+            // InternalMenuDsl.g:6982:2: rule__XAndExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0__Impl();
@@ -23835,23 +24266,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:6857:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:6988: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 {
-            // InternalMenuDsl.g:6861:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:6862:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:6992:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:6993:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:6862:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:6863:2: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:6993:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:6994:2: ( rule__XAndExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:6864:2: ( rule__XAndExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:6864:3: rule__XAndExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:6995:2: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:6995:3: rule__XAndExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__0();
@@ -23886,16 +24317,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:6873:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:7004: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 {
-            // InternalMenuDsl.g:6877:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
-            // InternalMenuDsl.g:6878:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
+            // InternalMenuDsl.g:7008:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
+            // InternalMenuDsl.g:7009:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_38);
+            pushFollow(FOLLOW_40);
             rule__XAndExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -23924,23 +24355,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:6885:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:7016: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 {
-            // InternalMenuDsl.g:6889:1: ( ( () ) )
-            // InternalMenuDsl.g:6890:1: ( () )
+            // InternalMenuDsl.g:7020:1: ( ( () ) )
+            // InternalMenuDsl.g:7021:1: ( () )
             {
-            // InternalMenuDsl.g:6890:1: ( () )
-            // InternalMenuDsl.g:6891:2: ()
+            // InternalMenuDsl.g:7021:1: ( () )
+            // InternalMenuDsl.g:7022:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:6892:2: ()
-            // InternalMenuDsl.g:6892:3: 
+            // InternalMenuDsl.g:7023:2: ()
+            // InternalMenuDsl.g:7023:3: 
             {
             }
 
@@ -23965,14 +24396,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1"
-    // InternalMenuDsl.g:6900:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:7031: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 {
-            // InternalMenuDsl.g:6904:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:6905:2: rule__XAndExpression__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:7035:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:7036:2: rule__XAndExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1__Impl();
@@ -23998,23 +24429,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:6911:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:7042: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 {
-            // InternalMenuDsl.g:6915:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:6916:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:7046:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:7047:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:6916:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalMenuDsl.g:6917:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:7047:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:7048:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:6918:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
-            // InternalMenuDsl.g:6918:3: rule__XAndExpression__FeatureAssignment_1_0_0_1
+            // InternalMenuDsl.g:7049:2: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:7049:3: rule__XAndExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAndExpression__FeatureAssignment_1_0_0_1();
@@ -24049,16 +24480,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0"
-    // InternalMenuDsl.g:6927:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
+    // InternalMenuDsl.g:7058: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 {
-            // InternalMenuDsl.g:6931:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
-            // InternalMenuDsl.g:6932:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
+            // InternalMenuDsl.g:7062:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
+            // InternalMenuDsl.g:7063:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
             {
-            pushFollow(FOLLOW_40);
+            pushFollow(FOLLOW_42);
             rule__XEqualityExpression__Group__0__Impl();
 
             state._fsp--;
@@ -24087,17 +24518,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0__Impl"
-    // InternalMenuDsl.g:6939:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
+    // InternalMenuDsl.g:7070:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6943:1: ( ( ruleXRelationalExpression ) )
-            // InternalMenuDsl.g:6944:1: ( ruleXRelationalExpression )
+            // InternalMenuDsl.g:7074:1: ( ( ruleXRelationalExpression ) )
+            // InternalMenuDsl.g:7075:1: ( ruleXRelationalExpression )
             {
-            // InternalMenuDsl.g:6944:1: ( ruleXRelationalExpression )
-            // InternalMenuDsl.g:6945:2: ruleXRelationalExpression
+            // InternalMenuDsl.g:7075:1: ( ruleXRelationalExpression )
+            // InternalMenuDsl.g:7076:2: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
@@ -24132,14 +24563,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1"
-    // InternalMenuDsl.g:6954:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:7085:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
     public final void rule__XEqualityExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:6958:1: ( rule__XEqualityExpression__Group__1__Impl )
-            // InternalMenuDsl.g:6959:2: rule__XEqualityExpression__Group__1__Impl
+            // InternalMenuDsl.g:7089:1: ( rule__XEqualityExpression__Group__1__Impl )
+            // InternalMenuDsl.g:7090:2: rule__XEqualityExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1__Impl();
@@ -24165,32 +24596,32 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1__Impl"
-    // InternalMenuDsl.g:6965:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:7096: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 {
-            // InternalMenuDsl.g:6969:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
-            // InternalMenuDsl.g:6970:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:7100:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
+            // InternalMenuDsl.g:7101:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:6970:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
-            // InternalMenuDsl.g:6971:2: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalMenuDsl.g:7101:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:7102:2: ( rule__XEqualityExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:6972:2: ( rule__XEqualityExpression__Group_1__0 )*
-            loop76:
+            // InternalMenuDsl.g:7103:2: ( rule__XEqualityExpression__Group_1__0 )*
+            loop74:
             do {
-                int alt76=2;
+                int alt74=2;
                 switch ( input.LA(1) ) {
                 case 21:
                     {
-                    int LA76_2 = input.LA(2);
+                    int LA74_2 = input.LA(2);
 
-                    if ( (synpred124_InternalMenuDsl()) ) {
-                        alt76=1;
+                    if ( (synpred123_InternalMenuDsl()) ) {
+                        alt74=1;
                     }
 
 
@@ -24198,10 +24629,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 22:
                     {
-                    int LA76_3 = input.LA(2);
+                    int LA74_3 = input.LA(2);
 
-                    if ( (synpred124_InternalMenuDsl()) ) {
-                        alt76=1;
+                    if ( (synpred123_InternalMenuDsl()) ) {
+                        alt74=1;
                     }
 
 
@@ -24209,10 +24640,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 23:
                     {
-                    int LA76_4 = input.LA(2);
+                    int LA74_4 = input.LA(2);
 
-                    if ( (synpred124_InternalMenuDsl()) ) {
-                        alt76=1;
+                    if ( (synpred123_InternalMenuDsl()) ) {
+                        alt74=1;
                     }
 
 
@@ -24220,10 +24651,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 24:
                     {
-                    int LA76_5 = input.LA(2);
+                    int LA74_5 = input.LA(2);
 
-                    if ( (synpred124_InternalMenuDsl()) ) {
-                        alt76=1;
+                    if ( (synpred123_InternalMenuDsl()) ) {
+                        alt74=1;
                     }
 
 
@@ -24232,11 +24663,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
                 }
 
-                switch (alt76) {
+                switch (alt74) {
             	case 1 :
-            	    // InternalMenuDsl.g:6972:3: rule__XEqualityExpression__Group_1__0
+            	    // InternalMenuDsl.g:7103:3: rule__XEqualityExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_41);
+            	    pushFollow(FOLLOW_43);
             	    rule__XEqualityExpression__Group_1__0();
 
             	    state._fsp--;
@@ -24246,7 +24677,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop74;
                 }
             } while (true);
 
@@ -24275,16 +24706,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0"
-    // InternalMenuDsl.g:6981:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
+    // InternalMenuDsl.g:7112: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 {
-            // InternalMenuDsl.g:6985:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
-            // InternalMenuDsl.g:6986:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
+            // InternalMenuDsl.g:7116:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
+            // InternalMenuDsl.g:7117:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XEqualityExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -24313,23 +24744,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0__Impl"
-    // InternalMenuDsl.g:6993:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:7124: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 {
-            // InternalMenuDsl.g:6997:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:6998:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:7128:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:7129:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:6998:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
-            // InternalMenuDsl.g:6999:2: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:7129:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:7130:2: ( rule__XEqualityExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:7000:2: ( rule__XEqualityExpression__Group_1_0__0 )
-            // InternalMenuDsl.g:7000:3: rule__XEqualityExpression__Group_1_0__0
+            // InternalMenuDsl.g:7131:2: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:7131:3: rule__XEqualityExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0();
@@ -24364,14 +24795,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1"
-    // InternalMenuDsl.g:7008:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
+    // InternalMenuDsl.g:7139: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 {
-            // InternalMenuDsl.g:7012:1: ( rule__XEqualityExpression__Group_1__1__Impl )
-            // InternalMenuDsl.g:7013:2: rule__XEqualityExpression__Group_1__1__Impl
+            // InternalMenuDsl.g:7143:1: ( rule__XEqualityExpression__Group_1__1__Impl )
+            // InternalMenuDsl.g:7144:2: rule__XEqualityExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1__Impl();
@@ -24397,23 +24828,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1__Impl"
-    // InternalMenuDsl.g:7019:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:7150: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 {
-            // InternalMenuDsl.g:7023:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:7024:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:7154:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:7155:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:7024:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
-            // InternalMenuDsl.g:7025:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:7155:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:7156:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:7026:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
-            // InternalMenuDsl.g:7026:3: rule__XEqualityExpression__RightOperandAssignment_1_1
+            // InternalMenuDsl.g:7157:2: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:7157:3: rule__XEqualityExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__RightOperandAssignment_1_1();
@@ -24448,14 +24879,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0"
-    // InternalMenuDsl.g:7035:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
+    // InternalMenuDsl.g:7166: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 {
-            // InternalMenuDsl.g:7039:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
-            // InternalMenuDsl.g:7040:2: rule__XEqualityExpression__Group_1_0__0__Impl
+            // InternalMenuDsl.g:7170:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
+            // InternalMenuDsl.g:7171:2: rule__XEqualityExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0__Impl();
@@ -24481,23 +24912,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:7046:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:7177: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 {
-            // InternalMenuDsl.g:7050:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:7051:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:7181:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:7182:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:7051:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:7052:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:7182:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:7183:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:7053:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:7053:3: rule__XEqualityExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:7184:2: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:7184:3: rule__XEqualityExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__0();
@@ -24532,16 +24963,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:7062:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:7193: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 {
-            // InternalMenuDsl.g:7066:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
-            // InternalMenuDsl.g:7067:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
+            // InternalMenuDsl.g:7197:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
+            // InternalMenuDsl.g:7198:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_40);
+            pushFollow(FOLLOW_42);
             rule__XEqualityExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -24570,23 +25001,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:7074:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:7205: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 {
-            // InternalMenuDsl.g:7078:1: ( ( () ) )
-            // InternalMenuDsl.g:7079:1: ( () )
+            // InternalMenuDsl.g:7209:1: ( ( () ) )
+            // InternalMenuDsl.g:7210:1: ( () )
             {
-            // InternalMenuDsl.g:7079:1: ( () )
-            // InternalMenuDsl.g:7080:2: ()
+            // InternalMenuDsl.g:7210:1: ( () )
+            // InternalMenuDsl.g:7211:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:7081:2: ()
-            // InternalMenuDsl.g:7081:3: 
+            // InternalMenuDsl.g:7212:2: ()
+            // InternalMenuDsl.g:7212:3: 
             {
             }
 
@@ -24611,14 +25042,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1"
-    // InternalMenuDsl.g:7089:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:7220: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 {
-            // InternalMenuDsl.g:7093:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:7094:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:7224:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:7225:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1__Impl();
@@ -24644,23 +25075,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:7100:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:7231: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 {
-            // InternalMenuDsl.g:7104:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:7105:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:7235:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:7236:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:7105:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalMenuDsl.g:7106:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:7236:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:7237:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:7107:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
-            // InternalMenuDsl.g:7107:3: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
+            // InternalMenuDsl.g:7238:2: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:7238:3: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XEqualityExpression__FeatureAssignment_1_0_0_1();
@@ -24695,16 +25126,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0"
-    // InternalMenuDsl.g:7116:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
+    // InternalMenuDsl.g:7247: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 {
-            // InternalMenuDsl.g:7120:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
-            // InternalMenuDsl.g:7121:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
+            // InternalMenuDsl.g:7251:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
+            // InternalMenuDsl.g:7252:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_42);
+            pushFollow(FOLLOW_44);
             rule__XRelationalExpression__Group__0__Impl();
 
             state._fsp--;
@@ -24733,17 +25164,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0__Impl"
-    // InternalMenuDsl.g:7128:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
+    // InternalMenuDsl.g:7259:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7132:1: ( ( ruleXOtherOperatorExpression ) )
-            // InternalMenuDsl.g:7133:1: ( ruleXOtherOperatorExpression )
+            // InternalMenuDsl.g:7263:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalMenuDsl.g:7264:1: ( ruleXOtherOperatorExpression )
             {
-            // InternalMenuDsl.g:7133:1: ( ruleXOtherOperatorExpression )
-            // InternalMenuDsl.g:7134:2: ruleXOtherOperatorExpression
+            // InternalMenuDsl.g:7264:1: ( ruleXOtherOperatorExpression )
+            // InternalMenuDsl.g:7265:2: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
@@ -24778,14 +25209,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1"
-    // InternalMenuDsl.g:7143:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:7274:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
     public final void rule__XRelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7147:1: ( rule__XRelationalExpression__Group__1__Impl )
-            // InternalMenuDsl.g:7148:2: rule__XRelationalExpression__Group__1__Impl
+            // InternalMenuDsl.g:7278:1: ( rule__XRelationalExpression__Group__1__Impl )
+            // InternalMenuDsl.g:7279:2: rule__XRelationalExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1__Impl();
@@ -24811,32 +25242,32 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1__Impl"
-    // InternalMenuDsl.g:7154:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
+    // InternalMenuDsl.g:7285:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
     public final void rule__XRelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7158:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
-            // InternalMenuDsl.g:7159:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalMenuDsl.g:7289:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
+            // InternalMenuDsl.g:7290:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
             {
-            // InternalMenuDsl.g:7159:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
-            // InternalMenuDsl.g:7160:2: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalMenuDsl.g:7290:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalMenuDsl.g:7291:2: ( rule__XRelationalExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getAlternatives_1()); 
             }
-            // InternalMenuDsl.g:7161:2: ( rule__XRelationalExpression__Alternatives_1 )*
-            loop77:
+            // InternalMenuDsl.g:7292:2: ( rule__XRelationalExpression__Alternatives_1 )*
+            loop75:
             do {
-                int alt77=2;
+                int alt75=2;
                 switch ( input.LA(1) ) {
                 case 27:
                     {
-                    int LA77_2 = input.LA(2);
+                    int LA75_2 = input.LA(2);
 
-                    if ( (synpred125_InternalMenuDsl()) ) {
-                        alt77=1;
+                    if ( (synpred124_InternalMenuDsl()) ) {
+                        alt75=1;
                     }
 
 
@@ -24844,21 +25275,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 26:
                     {
-                    int LA77_3 = input.LA(2);
+                    int LA75_3 = input.LA(2);
 
-                    if ( (synpred125_InternalMenuDsl()) ) {
-                        alt77=1;
+                    if ( (synpred124_InternalMenuDsl()) ) {
+                        alt75=1;
                     }
 
 
                     }
                     break;
-                case 67:
+                case 69:
                     {
-                    int LA77_4 = input.LA(2);
+                    int LA75_4 = input.LA(2);
 
-                    if ( (synpred125_InternalMenuDsl()) ) {
-                        alt77=1;
+                    if ( (synpred124_InternalMenuDsl()) ) {
+                        alt75=1;
                     }
 
 
@@ -24866,10 +25297,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 25:
                     {
-                    int LA77_5 = input.LA(2);
+                    int LA75_5 = input.LA(2);
 
-                    if ( (synpred125_InternalMenuDsl()) ) {
-                        alt77=1;
+                    if ( (synpred124_InternalMenuDsl()) ) {
+                        alt75=1;
                     }
 
 
@@ -24878,11 +25309,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
                 }
 
-                switch (alt77) {
+                switch (alt75) {
             	case 1 :
-            	    // InternalMenuDsl.g:7161:3: rule__XRelationalExpression__Alternatives_1
+            	    // InternalMenuDsl.g:7292:3: rule__XRelationalExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_43);
+            	    pushFollow(FOLLOW_45);
             	    rule__XRelationalExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -24892,7 +25323,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop75;
                 }
             } while (true);
 
@@ -24921,16 +25352,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0"
-    // InternalMenuDsl.g:7170:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
+    // InternalMenuDsl.g:7301: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 {
-            // InternalMenuDsl.g:7174:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
-            // InternalMenuDsl.g:7175:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
+            // InternalMenuDsl.g:7305:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
+            // InternalMenuDsl.g:7306:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XRelationalExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -24959,23 +25390,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:7182:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:7313: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 {
-            // InternalMenuDsl.g:7186:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:7187:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:7317:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:7318:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:7187:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:7188:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:7318:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:7319:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:7189:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:7189:3: rule__XRelationalExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:7320:2: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:7320:3: rule__XRelationalExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0();
@@ -25010,14 +25441,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1"
-    // InternalMenuDsl.g:7197:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
+    // InternalMenuDsl.g:7328: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 {
-            // InternalMenuDsl.g:7201:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
-            // InternalMenuDsl.g:7202:2: rule__XRelationalExpression__Group_1_0__1__Impl
+            // InternalMenuDsl.g:7332:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
+            // InternalMenuDsl.g:7333:2: rule__XRelationalExpression__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1__Impl();
@@ -25043,23 +25474,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1__Impl"
-    // InternalMenuDsl.g:7208:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
+    // InternalMenuDsl.g:7339: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 {
-            // InternalMenuDsl.g:7212:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
-            // InternalMenuDsl.g:7213:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:7343:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
+            // InternalMenuDsl.g:7344:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
             {
-            // InternalMenuDsl.g:7213:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
-            // InternalMenuDsl.g:7214:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalMenuDsl.g:7344:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:7345:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeAssignment_1_0_1()); 
             }
-            // InternalMenuDsl.g:7215:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
-            // InternalMenuDsl.g:7215:3: rule__XRelationalExpression__TypeAssignment_1_0_1
+            // InternalMenuDsl.g:7346:2: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalMenuDsl.g:7346:3: rule__XRelationalExpression__TypeAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__TypeAssignment_1_0_1();
@@ -25094,14 +25525,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:7224:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
+    // InternalMenuDsl.g:7355: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 {
-            // InternalMenuDsl.g:7228:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
-            // InternalMenuDsl.g:7229:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
+            // InternalMenuDsl.g:7359:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
+            // InternalMenuDsl.g:7360:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0__Impl();
@@ -25127,23 +25558,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:7235:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
+    // InternalMenuDsl.g:7366: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 {
-            // InternalMenuDsl.g:7239:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
-            // InternalMenuDsl.g:7240:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalMenuDsl.g:7370:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
+            // InternalMenuDsl.g:7371:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
             {
-            // InternalMenuDsl.g:7240:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
-            // InternalMenuDsl.g:7241:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalMenuDsl.g:7371:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalMenuDsl.g:7372:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:7242:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
-            // InternalMenuDsl.g:7242:3: rule__XRelationalExpression__Group_1_0_0_0__0
+            // InternalMenuDsl.g:7373:2: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalMenuDsl.g:7373:3: rule__XRelationalExpression__Group_1_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__0();
@@ -25178,16 +25609,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0"
-    // InternalMenuDsl.g:7251: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 ;
+    // InternalMenuDsl.g:7382: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 {
-            // InternalMenuDsl.g:7255:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
-            // InternalMenuDsl.g:7256:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
+            // InternalMenuDsl.g:7386:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
+            // InternalMenuDsl.g:7387:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_45);
+            pushFollow(FOLLOW_47);
             rule__XRelationalExpression__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
@@ -25216,23 +25647,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0__Impl"
-    // InternalMenuDsl.g:7263:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:7394: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 {
-            // InternalMenuDsl.g:7267:1: ( ( () ) )
-            // InternalMenuDsl.g:7268:1: ( () )
+            // InternalMenuDsl.g:7398:1: ( ( () ) )
+            // InternalMenuDsl.g:7399:1: ( () )
             {
-            // InternalMenuDsl.g:7268:1: ( () )
-            // InternalMenuDsl.g:7269:2: ()
+            // InternalMenuDsl.g:7399:1: ( () )
+            // InternalMenuDsl.g:7400:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()); 
             }
-            // InternalMenuDsl.g:7270:2: ()
-            // InternalMenuDsl.g:7270:3: 
+            // InternalMenuDsl.g:7401:2: ()
+            // InternalMenuDsl.g:7401:3: 
             {
             }
 
@@ -25257,14 +25688,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1"
-    // InternalMenuDsl.g:7278:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
+    // InternalMenuDsl.g:7409: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 {
-            // InternalMenuDsl.g:7282:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
-            // InternalMenuDsl.g:7283:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
+            // InternalMenuDsl.g:7413:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
+            // InternalMenuDsl.g:7414:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1__Impl();
@@ -25290,22 +25721,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1__Impl"
-    // InternalMenuDsl.g:7289:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
+    // InternalMenuDsl.g:7420: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 {
-            // InternalMenuDsl.g:7293:1: ( ( 'instanceof' ) )
-            // InternalMenuDsl.g:7294:1: ( 'instanceof' )
+            // InternalMenuDsl.g:7424:1: ( ( 'instanceof' ) )
+            // InternalMenuDsl.g:7425:1: ( 'instanceof' )
             {
-            // InternalMenuDsl.g:7294:1: ( 'instanceof' )
-            // InternalMenuDsl.g:7295:2: 'instanceof'
+            // InternalMenuDsl.g:7425:1: ( 'instanceof' )
+            // InternalMenuDsl.g:7426:2: 'instanceof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
-            match(input,67,FOLLOW_2); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
@@ -25331,16 +25762,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0"
-    // InternalMenuDsl.g:7305:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
+    // InternalMenuDsl.g:7436: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 {
-            // InternalMenuDsl.g:7309:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
-            // InternalMenuDsl.g:7310:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
+            // InternalMenuDsl.g:7440:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
+            // InternalMenuDsl.g:7441:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XRelationalExpression__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -25369,23 +25800,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0__Impl"
-    // InternalMenuDsl.g:7317:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
+    // InternalMenuDsl.g:7448: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 {
-            // InternalMenuDsl.g:7321:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
-            // InternalMenuDsl.g:7322:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalMenuDsl.g:7452:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
+            // InternalMenuDsl.g:7453:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
             {
-            // InternalMenuDsl.g:7322:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
-            // InternalMenuDsl.g:7323:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalMenuDsl.g:7453:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalMenuDsl.g:7454:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0()); 
             }
-            // InternalMenuDsl.g:7324:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
-            // InternalMenuDsl.g:7324:3: rule__XRelationalExpression__Group_1_1_0__0
+            // InternalMenuDsl.g:7455:2: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalMenuDsl.g:7455:3: rule__XRelationalExpression__Group_1_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0();
@@ -25420,14 +25851,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1"
-    // InternalMenuDsl.g:7332:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
+    // InternalMenuDsl.g:7463: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 {
-            // InternalMenuDsl.g:7336:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
-            // InternalMenuDsl.g:7337:2: rule__XRelationalExpression__Group_1_1__1__Impl
+            // InternalMenuDsl.g:7467:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
+            // InternalMenuDsl.g:7468:2: rule__XRelationalExpression__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1__Impl();
@@ -25453,23 +25884,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1__Impl"
-    // InternalMenuDsl.g:7343:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalMenuDsl.g:7474: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 {
-            // InternalMenuDsl.g:7347:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
-            // InternalMenuDsl.g:7348:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalMenuDsl.g:7478:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
+            // InternalMenuDsl.g:7479:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
             {
-            // InternalMenuDsl.g:7348:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
-            // InternalMenuDsl.g:7349:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalMenuDsl.g:7479:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalMenuDsl.g:7480:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // InternalMenuDsl.g:7350:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
-            // InternalMenuDsl.g:7350:3: rule__XRelationalExpression__RightOperandAssignment_1_1_1
+            // InternalMenuDsl.g:7481:2: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalMenuDsl.g:7481:3: rule__XRelationalExpression__RightOperandAssignment_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__RightOperandAssignment_1_1_1();
@@ -25504,14 +25935,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0"
-    // InternalMenuDsl.g:7359:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
+    // InternalMenuDsl.g:7490: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 {
-            // InternalMenuDsl.g:7363:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
-            // InternalMenuDsl.g:7364:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
+            // InternalMenuDsl.g:7494:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
+            // InternalMenuDsl.g:7495:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0__Impl();
@@ -25537,23 +25968,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0__Impl"
-    // InternalMenuDsl.g:7370:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:7501: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 {
-            // InternalMenuDsl.g:7374:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:7375:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalMenuDsl.g:7505:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:7506:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:7375:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
-            // InternalMenuDsl.g:7376:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalMenuDsl.g:7506:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalMenuDsl.g:7507:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0_0()); 
             }
-            // InternalMenuDsl.g:7377:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
-            // InternalMenuDsl.g:7377:3: rule__XRelationalExpression__Group_1_1_0_0__0
+            // InternalMenuDsl.g:7508:2: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalMenuDsl.g:7508:3: rule__XRelationalExpression__Group_1_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__0();
@@ -25588,16 +26019,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0"
-    // InternalMenuDsl.g:7386: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 ;
+    // InternalMenuDsl.g:7517: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 {
-            // InternalMenuDsl.g:7390:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
-            // InternalMenuDsl.g:7391:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
+            // InternalMenuDsl.g:7521:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
+            // InternalMenuDsl.g:7522:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_42);
+            pushFollow(FOLLOW_44);
             rule__XRelationalExpression__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
@@ -25626,23 +26057,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0__Impl"
-    // InternalMenuDsl.g:7398:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:7529: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 {
-            // InternalMenuDsl.g:7402:1: ( ( () ) )
-            // InternalMenuDsl.g:7403:1: ( () )
+            // InternalMenuDsl.g:7533:1: ( ( () ) )
+            // InternalMenuDsl.g:7534:1: ( () )
             {
-            // InternalMenuDsl.g:7403:1: ( () )
-            // InternalMenuDsl.g:7404:2: ()
+            // InternalMenuDsl.g:7534:1: ( () )
+            // InternalMenuDsl.g:7535:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:7405:2: ()
-            // InternalMenuDsl.g:7405:3: 
+            // InternalMenuDsl.g:7536:2: ()
+            // InternalMenuDsl.g:7536:3: 
             {
             }
 
@@ -25667,14 +26098,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1"
-    // InternalMenuDsl.g:7413:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:7544: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 {
-            // InternalMenuDsl.g:7417:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
-            // InternalMenuDsl.g:7418:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
+            // InternalMenuDsl.g:7548:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
+            // InternalMenuDsl.g:7549:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1__Impl();
@@ -25700,23 +26131,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1__Impl"
-    // InternalMenuDsl.g:7424:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:7555: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 {
-            // InternalMenuDsl.g:7428:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:7429:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalMenuDsl.g:7559:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:7560:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:7429:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
-            // InternalMenuDsl.g:7430:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalMenuDsl.g:7560:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalMenuDsl.g:7561:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:7431:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
-            // InternalMenuDsl.g:7431:3: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
+            // InternalMenuDsl.g:7562:2: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalMenuDsl.g:7562:3: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1();
@@ -25751,16 +26182,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0"
-    // InternalMenuDsl.g:7440:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
+    // InternalMenuDsl.g:7571: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 {
-            // InternalMenuDsl.g:7444:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
-            // InternalMenuDsl.g:7445:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
+            // InternalMenuDsl.g:7575:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
+            // InternalMenuDsl.g:7576:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__OpCompare__Group_1__0__Impl();
 
             state._fsp--;
@@ -25789,17 +26220,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0__Impl"
-    // InternalMenuDsl.g:7452:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:7583:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
     public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7456:1: ( ( '<' ) )
-            // InternalMenuDsl.g:7457:1: ( '<' )
+            // InternalMenuDsl.g:7587:1: ( ( '<' ) )
+            // InternalMenuDsl.g:7588:1: ( '<' )
             {
-            // InternalMenuDsl.g:7457:1: ( '<' )
-            // InternalMenuDsl.g:7458:2: '<'
+            // InternalMenuDsl.g:7588:1: ( '<' )
+            // InternalMenuDsl.g:7589:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
@@ -25830,14 +26261,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1"
-    // InternalMenuDsl.g:7467:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
+    // InternalMenuDsl.g:7598: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 {
-            // InternalMenuDsl.g:7471:1: ( rule__OpCompare__Group_1__1__Impl )
-            // InternalMenuDsl.g:7472:2: rule__OpCompare__Group_1__1__Impl
+            // InternalMenuDsl.g:7602:1: ( rule__OpCompare__Group_1__1__Impl )
+            // InternalMenuDsl.g:7603:2: rule__OpCompare__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1__Impl();
@@ -25863,17 +26294,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1__Impl"
-    // InternalMenuDsl.g:7478:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
+    // InternalMenuDsl.g:7609:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
     public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7482:1: ( ( '=' ) )
-            // InternalMenuDsl.g:7483:1: ( '=' )
+            // InternalMenuDsl.g:7613:1: ( ( '=' ) )
+            // InternalMenuDsl.g:7614:1: ( '=' )
             {
-            // InternalMenuDsl.g:7483:1: ( '=' )
-            // InternalMenuDsl.g:7484:2: '='
+            // InternalMenuDsl.g:7614:1: ( '=' )
+            // InternalMenuDsl.g:7615:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
@@ -25904,16 +26335,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0"
-    // InternalMenuDsl.g:7494:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
+    // InternalMenuDsl.g:7625: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 {
-            // InternalMenuDsl.g:7498:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
-            // InternalMenuDsl.g:7499:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
+            // InternalMenuDsl.g:7629:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
+            // InternalMenuDsl.g:7630:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
             {
-            pushFollow(FOLLOW_46);
+            pushFollow(FOLLOW_48);
             rule__XOtherOperatorExpression__Group__0__Impl();
 
             state._fsp--;
@@ -25942,17 +26373,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0__Impl"
-    // InternalMenuDsl.g:7506:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
+    // InternalMenuDsl.g:7637:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7510:1: ( ( ruleXAdditiveExpression ) )
-            // InternalMenuDsl.g:7511:1: ( ruleXAdditiveExpression )
+            // InternalMenuDsl.g:7641:1: ( ( ruleXAdditiveExpression ) )
+            // InternalMenuDsl.g:7642:1: ( ruleXAdditiveExpression )
             {
-            // InternalMenuDsl.g:7511:1: ( ruleXAdditiveExpression )
-            // InternalMenuDsl.g:7512:2: ruleXAdditiveExpression
+            // InternalMenuDsl.g:7642:1: ( ruleXAdditiveExpression )
+            // InternalMenuDsl.g:7643:2: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
@@ -25987,14 +26418,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1"
-    // InternalMenuDsl.g:7521:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:7652:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7525:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
-            // InternalMenuDsl.g:7526:2: rule__XOtherOperatorExpression__Group__1__Impl
+            // InternalMenuDsl.g:7656:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
+            // InternalMenuDsl.g:7657:2: rule__XOtherOperatorExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1__Impl();
@@ -26020,31 +26451,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1__Impl"
-    // InternalMenuDsl.g:7532:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:7663: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 {
-            // InternalMenuDsl.g:7536:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
-            // InternalMenuDsl.g:7537:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:7667:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
+            // InternalMenuDsl.g:7668:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:7537:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
-            // InternalMenuDsl.g:7538:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalMenuDsl.g:7668:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:7669:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:7539:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
-            loop78:
+            // InternalMenuDsl.g:7670:2: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            loop76:
             do {
-                int alt78=2;
-                alt78 = dfa78.predict(input);
-                switch (alt78) {
+                int alt76=2;
+                alt76 = dfa76.predict(input);
+                switch (alt76) {
             	case 1 :
-            	    // InternalMenuDsl.g:7539:3: rule__XOtherOperatorExpression__Group_1__0
+            	    // InternalMenuDsl.g:7670:3: rule__XOtherOperatorExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_47);
+            	    pushFollow(FOLLOW_49);
             	    rule__XOtherOperatorExpression__Group_1__0();
 
             	    state._fsp--;
@@ -26054,7 +26485,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop78;
+            	    break loop76;
                 }
             } while (true);
 
@@ -26083,16 +26514,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0"
-    // InternalMenuDsl.g:7548:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
+    // InternalMenuDsl.g:7679: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 {
-            // InternalMenuDsl.g:7552:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
-            // InternalMenuDsl.g:7553:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
+            // InternalMenuDsl.g:7683:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
+            // InternalMenuDsl.g:7684:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XOtherOperatorExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -26121,23 +26552,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0__Impl"
-    // InternalMenuDsl.g:7560:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:7691: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 {
-            // InternalMenuDsl.g:7564:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:7565:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:7695:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:7696:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:7565:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
-            // InternalMenuDsl.g:7566:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:7696:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:7697:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:7567:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
-            // InternalMenuDsl.g:7567:3: rule__XOtherOperatorExpression__Group_1_0__0
+            // InternalMenuDsl.g:7698:2: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:7698:3: rule__XOtherOperatorExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0();
@@ -26172,14 +26603,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1"
-    // InternalMenuDsl.g:7575:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
+    // InternalMenuDsl.g:7706: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 {
-            // InternalMenuDsl.g:7579:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
-            // InternalMenuDsl.g:7580:2: rule__XOtherOperatorExpression__Group_1__1__Impl
+            // InternalMenuDsl.g:7710:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
+            // InternalMenuDsl.g:7711:2: rule__XOtherOperatorExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1__Impl();
@@ -26205,23 +26636,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1__Impl"
-    // InternalMenuDsl.g:7586:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:7717: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 {
-            // InternalMenuDsl.g:7590:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:7591:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:7721:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:7722:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:7591:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
-            // InternalMenuDsl.g:7592:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:7722:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:7723:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:7593:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
-            // InternalMenuDsl.g:7593:3: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
+            // InternalMenuDsl.g:7724:2: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:7724:3: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__RightOperandAssignment_1_1();
@@ -26256,14 +26687,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0"
-    // InternalMenuDsl.g:7602:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
+    // InternalMenuDsl.g:7733: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 {
-            // InternalMenuDsl.g:7606:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
-            // InternalMenuDsl.g:7607:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
+            // InternalMenuDsl.g:7737:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
+            // InternalMenuDsl.g:7738:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0__Impl();
@@ -26289,23 +26720,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:7613:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:7744: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 {
-            // InternalMenuDsl.g:7617:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:7618:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:7748:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:7749:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:7618:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:7619:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:7749:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:7750:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:7620:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:7620:3: rule__XOtherOperatorExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:7751:2: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:7751:3: rule__XOtherOperatorExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__0();
@@ -26340,16 +26771,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:7629:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:7760: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 {
-            // InternalMenuDsl.g:7633:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
-            // InternalMenuDsl.g:7634:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
+            // InternalMenuDsl.g:7764:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
+            // InternalMenuDsl.g:7765:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_46);
+            pushFollow(FOLLOW_48);
             rule__XOtherOperatorExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -26378,23 +26809,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:7641:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:7772: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 {
-            // InternalMenuDsl.g:7645:1: ( ( () ) )
-            // InternalMenuDsl.g:7646:1: ( () )
+            // InternalMenuDsl.g:7776:1: ( ( () ) )
+            // InternalMenuDsl.g:7777:1: ( () )
             {
-            // InternalMenuDsl.g:7646:1: ( () )
-            // InternalMenuDsl.g:7647:2: ()
+            // InternalMenuDsl.g:7777:1: ( () )
+            // InternalMenuDsl.g:7778:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:7648:2: ()
-            // InternalMenuDsl.g:7648:3: 
+            // InternalMenuDsl.g:7779:2: ()
+            // InternalMenuDsl.g:7779:3: 
             {
             }
 
@@ -26419,14 +26850,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1"
-    // InternalMenuDsl.g:7656:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:7787: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 {
-            // InternalMenuDsl.g:7660:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:7661:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:7791:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:7792:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1__Impl();
@@ -26452,23 +26883,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:7667:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:7798: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 {
-            // InternalMenuDsl.g:7671:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:7672:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:7802:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:7803:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:7672:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalMenuDsl.g:7673:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:7803:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:7804:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:7674:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
-            // InternalMenuDsl.g:7674:3: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
+            // InternalMenuDsl.g:7805:2: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:7805:3: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1();
@@ -26503,16 +26934,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_2__0"
-    // InternalMenuDsl.g:7683:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
+    // InternalMenuDsl.g:7814: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 {
-            // InternalMenuDsl.g:7687:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
-            // InternalMenuDsl.g:7688:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
+            // InternalMenuDsl.g:7818:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
+            // InternalMenuDsl.g:7819:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
             {
-            pushFollow(FOLLOW_48);
+            pushFollow(FOLLOW_50);
             rule__OpOther__Group_2__0__Impl();
 
             state._fsp--;
@@ -26541,17 +26972,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_2__0__Impl"
-    // InternalMenuDsl.g:7695:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:7826:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7699:1: ( ( '>' ) )
-            // InternalMenuDsl.g:7700:1: ( '>' )
+            // InternalMenuDsl.g:7830:1: ( ( '>' ) )
+            // InternalMenuDsl.g:7831:1: ( '>' )
             {
-            // InternalMenuDsl.g:7700:1: ( '>' )
-            // InternalMenuDsl.g:7701:2: '>'
+            // InternalMenuDsl.g:7831:1: ( '>' )
+            // InternalMenuDsl.g:7832:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
@@ -26582,14 +27013,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_2__1"
-    // InternalMenuDsl.g:7710:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
+    // InternalMenuDsl.g:7841: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 {
-            // InternalMenuDsl.g:7714:1: ( rule__OpOther__Group_2__1__Impl )
-            // InternalMenuDsl.g:7715:2: rule__OpOther__Group_2__1__Impl
+            // InternalMenuDsl.g:7845:1: ( rule__OpOther__Group_2__1__Impl )
+            // InternalMenuDsl.g:7846:2: rule__OpOther__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1__Impl();
@@ -26615,17 +27046,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_2__1__Impl"
-    // InternalMenuDsl.g:7721:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
+    // InternalMenuDsl.g:7852:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
     public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7725:1: ( ( '..' ) )
-            // InternalMenuDsl.g:7726:1: ( '..' )
+            // InternalMenuDsl.g:7856:1: ( ( '..' ) )
+            // InternalMenuDsl.g:7857:1: ( '..' )
             {
-            // InternalMenuDsl.g:7726:1: ( '..' )
-            // InternalMenuDsl.g:7727:2: '..'
+            // InternalMenuDsl.g:7857:1: ( '..' )
+            // InternalMenuDsl.g:7858:2: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
@@ -26656,16 +27087,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5__0"
-    // InternalMenuDsl.g:7737:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
+    // InternalMenuDsl.g:7868: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 {
-            // InternalMenuDsl.g:7741:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
-            // InternalMenuDsl.g:7742:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
+            // InternalMenuDsl.g:7872:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
+            // InternalMenuDsl.g:7873:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
             {
-            pushFollow(FOLLOW_49);
+            pushFollow(FOLLOW_51);
             rule__OpOther__Group_5__0__Impl();
 
             state._fsp--;
@@ -26694,17 +27125,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5__0__Impl"
-    // InternalMenuDsl.g:7749:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:7880:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7753:1: ( ( '>' ) )
-            // InternalMenuDsl.g:7754:1: ( '>' )
+            // InternalMenuDsl.g:7884:1: ( ( '>' ) )
+            // InternalMenuDsl.g:7885:1: ( '>' )
             {
-            // InternalMenuDsl.g:7754:1: ( '>' )
-            // InternalMenuDsl.g:7755:2: '>'
+            // InternalMenuDsl.g:7885:1: ( '>' )
+            // InternalMenuDsl.g:7886:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
@@ -26735,14 +27166,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5__1"
-    // InternalMenuDsl.g:7764:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
+    // InternalMenuDsl.g:7895: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 {
-            // InternalMenuDsl.g:7768:1: ( rule__OpOther__Group_5__1__Impl )
-            // InternalMenuDsl.g:7769:2: rule__OpOther__Group_5__1__Impl
+            // InternalMenuDsl.g:7899:1: ( rule__OpOther__Group_5__1__Impl )
+            // InternalMenuDsl.g:7900:2: rule__OpOther__Group_5__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1__Impl();
@@ -26768,23 +27199,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5__1__Impl"
-    // InternalMenuDsl.g:7775:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
+    // InternalMenuDsl.g:7906: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 {
-            // InternalMenuDsl.g:7779:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
-            // InternalMenuDsl.g:7780:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalMenuDsl.g:7910:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
+            // InternalMenuDsl.g:7911:1: ( ( rule__OpOther__Alternatives_5_1 ) )
             {
-            // InternalMenuDsl.g:7780:1: ( ( rule__OpOther__Alternatives_5_1 ) )
-            // InternalMenuDsl.g:7781:2: ( rule__OpOther__Alternatives_5_1 )
+            // InternalMenuDsl.g:7911:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalMenuDsl.g:7912:2: ( rule__OpOther__Alternatives_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_5_1()); 
             }
-            // InternalMenuDsl.g:7782:2: ( rule__OpOther__Alternatives_5_1 )
-            // InternalMenuDsl.g:7782:3: rule__OpOther__Alternatives_5_1
+            // InternalMenuDsl.g:7913:2: ( rule__OpOther__Alternatives_5_1 )
+            // InternalMenuDsl.g:7913:3: rule__OpOther__Alternatives_5_1
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_5_1();
@@ -26819,14 +27250,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0"
-    // InternalMenuDsl.g:7791:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
+    // InternalMenuDsl.g:7922: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 {
-            // InternalMenuDsl.g:7795:1: ( rule__OpOther__Group_5_1_0__0__Impl )
-            // InternalMenuDsl.g:7796:2: rule__OpOther__Group_5_1_0__0__Impl
+            // InternalMenuDsl.g:7926:1: ( rule__OpOther__Group_5_1_0__0__Impl )
+            // InternalMenuDsl.g:7927:2: rule__OpOther__Group_5_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0__0__Impl();
@@ -26852,23 +27283,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0__Impl"
-    // InternalMenuDsl.g:7802:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:7933: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 {
-            // InternalMenuDsl.g:7806:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:7807:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalMenuDsl.g:7937:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:7938:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:7807:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
-            // InternalMenuDsl.g:7808:2: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalMenuDsl.g:7938:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalMenuDsl.g:7939:2: ( rule__OpOther__Group_5_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_5_1_0_0()); 
             }
-            // InternalMenuDsl.g:7809:2: ( rule__OpOther__Group_5_1_0_0__0 )
-            // InternalMenuDsl.g:7809:3: rule__OpOther__Group_5_1_0_0__0
+            // InternalMenuDsl.g:7940:2: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalMenuDsl.g:7940:3: rule__OpOther__Group_5_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__0();
@@ -26903,16 +27334,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0"
-    // InternalMenuDsl.g:7818: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 ;
+    // InternalMenuDsl.g:7949: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 {
-            // InternalMenuDsl.g:7822:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
-            // InternalMenuDsl.g:7823:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
+            // InternalMenuDsl.g:7953:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
+            // InternalMenuDsl.g:7954:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
             {
-            pushFollow(FOLLOW_49);
+            pushFollow(FOLLOW_51);
             rule__OpOther__Group_5_1_0_0__0__Impl();
 
             state._fsp--;
@@ -26941,17 +27372,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0__Impl"
-    // InternalMenuDsl.g:7830:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:7961: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 {
-            // InternalMenuDsl.g:7834:1: ( ( '>' ) )
-            // InternalMenuDsl.g:7835:1: ( '>' )
+            // InternalMenuDsl.g:7965:1: ( ( '>' ) )
+            // InternalMenuDsl.g:7966:1: ( '>' )
             {
-            // InternalMenuDsl.g:7835:1: ( '>' )
-            // InternalMenuDsl.g:7836:2: '>'
+            // InternalMenuDsl.g:7966:1: ( '>' )
+            // InternalMenuDsl.g:7967:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
@@ -26982,14 +27413,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1"
-    // InternalMenuDsl.g:7845:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:7976: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 {
-            // InternalMenuDsl.g:7849:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
-            // InternalMenuDsl.g:7850:2: rule__OpOther__Group_5_1_0_0__1__Impl
+            // InternalMenuDsl.g:7980:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
+            // InternalMenuDsl.g:7981:2: rule__OpOther__Group_5_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1__Impl();
@@ -27015,17 +27446,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1__Impl"
-    // InternalMenuDsl.g:7856:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:7987: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 {
-            // InternalMenuDsl.g:7860:1: ( ( '>' ) )
-            // InternalMenuDsl.g:7861:1: ( '>' )
+            // InternalMenuDsl.g:7991:1: ( ( '>' ) )
+            // InternalMenuDsl.g:7992:1: ( '>' )
             {
-            // InternalMenuDsl.g:7861:1: ( '>' )
-            // InternalMenuDsl.g:7862:2: '>'
+            // InternalMenuDsl.g:7992:1: ( '>' )
+            // InternalMenuDsl.g:7993:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
@@ -27056,16 +27487,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6__0"
-    // InternalMenuDsl.g:7872:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
+    // InternalMenuDsl.g:8003: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 {
-            // InternalMenuDsl.g:7876:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
-            // InternalMenuDsl.g:7877:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
+            // InternalMenuDsl.g:8007:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
+            // InternalMenuDsl.g:8008:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
             {
-            pushFollow(FOLLOW_50);
+            pushFollow(FOLLOW_52);
             rule__OpOther__Group_6__0__Impl();
 
             state._fsp--;
@@ -27094,17 +27525,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6__0__Impl"
-    // InternalMenuDsl.g:7884:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:8015:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:7888:1: ( ( '<' ) )
-            // InternalMenuDsl.g:7889:1: ( '<' )
+            // InternalMenuDsl.g:8019:1: ( ( '<' ) )
+            // InternalMenuDsl.g:8020:1: ( '<' )
             {
-            // InternalMenuDsl.g:7889:1: ( '<' )
-            // InternalMenuDsl.g:7890:2: '<'
+            // InternalMenuDsl.g:8020:1: ( '<' )
+            // InternalMenuDsl.g:8021:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
@@ -27135,14 +27566,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6__1"
-    // InternalMenuDsl.g:7899:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
+    // InternalMenuDsl.g:8030: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 {
-            // InternalMenuDsl.g:7903:1: ( rule__OpOther__Group_6__1__Impl )
-            // InternalMenuDsl.g:7904:2: rule__OpOther__Group_6__1__Impl
+            // InternalMenuDsl.g:8034:1: ( rule__OpOther__Group_6__1__Impl )
+            // InternalMenuDsl.g:8035:2: rule__OpOther__Group_6__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1__Impl();
@@ -27168,23 +27599,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6__1__Impl"
-    // InternalMenuDsl.g:7910:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
+    // InternalMenuDsl.g:8041: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 {
-            // InternalMenuDsl.g:7914:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
-            // InternalMenuDsl.g:7915:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalMenuDsl.g:8045:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
+            // InternalMenuDsl.g:8046:1: ( ( rule__OpOther__Alternatives_6_1 ) )
             {
-            // InternalMenuDsl.g:7915:1: ( ( rule__OpOther__Alternatives_6_1 ) )
-            // InternalMenuDsl.g:7916:2: ( rule__OpOther__Alternatives_6_1 )
+            // InternalMenuDsl.g:8046:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalMenuDsl.g:8047:2: ( rule__OpOther__Alternatives_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_6_1()); 
             }
-            // InternalMenuDsl.g:7917:2: ( rule__OpOther__Alternatives_6_1 )
-            // InternalMenuDsl.g:7917:3: rule__OpOther__Alternatives_6_1
+            // InternalMenuDsl.g:8048:2: ( rule__OpOther__Alternatives_6_1 )
+            // InternalMenuDsl.g:8048:3: rule__OpOther__Alternatives_6_1
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_6_1();
@@ -27219,14 +27650,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0"
-    // InternalMenuDsl.g:7926:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
+    // InternalMenuDsl.g:8057: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 {
-            // InternalMenuDsl.g:7930:1: ( rule__OpOther__Group_6_1_0__0__Impl )
-            // InternalMenuDsl.g:7931:2: rule__OpOther__Group_6_1_0__0__Impl
+            // InternalMenuDsl.g:8061:1: ( rule__OpOther__Group_6_1_0__0__Impl )
+            // InternalMenuDsl.g:8062:2: rule__OpOther__Group_6_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0__0__Impl();
@@ -27252,23 +27683,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0__Impl"
-    // InternalMenuDsl.g:7937:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:8068: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 {
-            // InternalMenuDsl.g:7941:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:7942:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalMenuDsl.g:8072:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:8073:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:7942:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
-            // InternalMenuDsl.g:7943:2: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalMenuDsl.g:8073:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalMenuDsl.g:8074:2: ( rule__OpOther__Group_6_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_6_1_0_0()); 
             }
-            // InternalMenuDsl.g:7944:2: ( rule__OpOther__Group_6_1_0_0__0 )
-            // InternalMenuDsl.g:7944:3: rule__OpOther__Group_6_1_0_0__0
+            // InternalMenuDsl.g:8075:2: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalMenuDsl.g:8075:3: rule__OpOther__Group_6_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__0();
@@ -27303,16 +27734,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0"
-    // InternalMenuDsl.g:7953: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 ;
+    // InternalMenuDsl.g:8084: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 {
-            // InternalMenuDsl.g:7957:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
-            // InternalMenuDsl.g:7958:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
+            // InternalMenuDsl.g:8088:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
+            // InternalMenuDsl.g:8089:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
             {
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_36);
             rule__OpOther__Group_6_1_0_0__0__Impl();
 
             state._fsp--;
@@ -27341,17 +27772,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0__Impl"
-    // InternalMenuDsl.g:7965:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:8096: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 {
-            // InternalMenuDsl.g:7969:1: ( ( '<' ) )
-            // InternalMenuDsl.g:7970:1: ( '<' )
+            // InternalMenuDsl.g:8100:1: ( ( '<' ) )
+            // InternalMenuDsl.g:8101:1: ( '<' )
             {
-            // InternalMenuDsl.g:7970:1: ( '<' )
-            // InternalMenuDsl.g:7971:2: '<'
+            // InternalMenuDsl.g:8101:1: ( '<' )
+            // InternalMenuDsl.g:8102:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
@@ -27382,14 +27813,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1"
-    // InternalMenuDsl.g:7980:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:8111: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 {
-            // InternalMenuDsl.g:7984:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
-            // InternalMenuDsl.g:7985:2: rule__OpOther__Group_6_1_0_0__1__Impl
+            // InternalMenuDsl.g:8115:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
+            // InternalMenuDsl.g:8116:2: rule__OpOther__Group_6_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1__Impl();
@@ -27415,17 +27846,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1__Impl"
-    // InternalMenuDsl.g:7991:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:8122: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 {
-            // InternalMenuDsl.g:7995:1: ( ( '<' ) )
-            // InternalMenuDsl.g:7996:1: ( '<' )
+            // InternalMenuDsl.g:8126:1: ( ( '<' ) )
+            // InternalMenuDsl.g:8127:1: ( '<' )
             {
-            // InternalMenuDsl.g:7996:1: ( '<' )
-            // InternalMenuDsl.g:7997:2: '<'
+            // InternalMenuDsl.g:8127:1: ( '<' )
+            // InternalMenuDsl.g:8128:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
@@ -27456,16 +27887,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0"
-    // InternalMenuDsl.g:8007:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
+    // InternalMenuDsl.g:8138: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 {
-            // InternalMenuDsl.g:8011:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
-            // InternalMenuDsl.g:8012:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
+            // InternalMenuDsl.g:8142:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
+            // InternalMenuDsl.g:8143:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_51);
+            pushFollow(FOLLOW_53);
             rule__XAdditiveExpression__Group__0__Impl();
 
             state._fsp--;
@@ -27494,17 +27925,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0__Impl"
-    // InternalMenuDsl.g:8019:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
+    // InternalMenuDsl.g:8150:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8023:1: ( ( ruleXMultiplicativeExpression ) )
-            // InternalMenuDsl.g:8024:1: ( ruleXMultiplicativeExpression )
+            // InternalMenuDsl.g:8154:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalMenuDsl.g:8155:1: ( ruleXMultiplicativeExpression )
             {
-            // InternalMenuDsl.g:8024:1: ( ruleXMultiplicativeExpression )
-            // InternalMenuDsl.g:8025:2: ruleXMultiplicativeExpression
+            // InternalMenuDsl.g:8155:1: ( ruleXMultiplicativeExpression )
+            // InternalMenuDsl.g:8156:2: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
@@ -27539,14 +27970,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1"
-    // InternalMenuDsl.g:8034:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:8165:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
     public final void rule__XAdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8038:1: ( rule__XAdditiveExpression__Group__1__Impl )
-            // InternalMenuDsl.g:8039:2: rule__XAdditiveExpression__Group__1__Impl
+            // InternalMenuDsl.g:8169:1: ( rule__XAdditiveExpression__Group__1__Impl )
+            // InternalMenuDsl.g:8170:2: rule__XAdditiveExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1__Impl();
@@ -27572,52 +28003,52 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1__Impl"
-    // InternalMenuDsl.g:8045:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:8176: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 {
-            // InternalMenuDsl.g:8049:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
-            // InternalMenuDsl.g:8050:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:8180:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
+            // InternalMenuDsl.g:8181:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:8050:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
-            // InternalMenuDsl.g:8051:2: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalMenuDsl.g:8181:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:8182:2: ( rule__XAdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:8052:2: ( rule__XAdditiveExpression__Group_1__0 )*
-            loop79:
+            // InternalMenuDsl.g:8183:2: ( rule__XAdditiveExpression__Group_1__0 )*
+            loop77:
             do {
-                int alt79=2;
-                int LA79_0 = input.LA(1);
+                int alt77=2;
+                int LA77_0 = input.LA(1);
 
-                if ( (LA79_0==35) ) {
-                    int LA79_2 = input.LA(2);
+                if ( (LA77_0==35) ) {
+                    int LA77_2 = input.LA(2);
 
-                    if ( (synpred127_InternalMenuDsl()) ) {
-                        alt79=1;
+                    if ( (synpred126_InternalMenuDsl()) ) {
+                        alt77=1;
                     }
 
 
                 }
-                else if ( (LA79_0==34) ) {
-                    int LA79_3 = input.LA(2);
+                else if ( (LA77_0==34) ) {
+                    int LA77_3 = input.LA(2);
 
-                    if ( (synpred127_InternalMenuDsl()) ) {
-                        alt79=1;
+                    if ( (synpred126_InternalMenuDsl()) ) {
+                        alt77=1;
                     }
 
 
                 }
 
 
-                switch (alt79) {
+                switch (alt77) {
             	case 1 :
-            	    // InternalMenuDsl.g:8052:3: rule__XAdditiveExpression__Group_1__0
+            	    // InternalMenuDsl.g:8183:3: rule__XAdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_52);
+            	    pushFollow(FOLLOW_54);
             	    rule__XAdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -27627,7 +28058,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop79;
+            	    break loop77;
                 }
             } while (true);
 
@@ -27656,16 +28087,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0"
-    // InternalMenuDsl.g:8061:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
+    // InternalMenuDsl.g:8192: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 {
-            // InternalMenuDsl.g:8065:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
-            // InternalMenuDsl.g:8066:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
+            // InternalMenuDsl.g:8196:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
+            // InternalMenuDsl.g:8197:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XAdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -27694,23 +28125,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0__Impl"
-    // InternalMenuDsl.g:8073:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:8204: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 {
-            // InternalMenuDsl.g:8077:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:8078:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8208:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:8209:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:8078:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
-            // InternalMenuDsl.g:8079:2: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:8209:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8210:2: ( rule__XAdditiveExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:8080:2: ( rule__XAdditiveExpression__Group_1_0__0 )
-            // InternalMenuDsl.g:8080:3: rule__XAdditiveExpression__Group_1_0__0
+            // InternalMenuDsl.g:8211:2: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:8211:3: rule__XAdditiveExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0();
@@ -27745,14 +28176,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1"
-    // InternalMenuDsl.g:8088:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
+    // InternalMenuDsl.g:8219: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 {
-            // InternalMenuDsl.g:8092:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
-            // InternalMenuDsl.g:8093:2: rule__XAdditiveExpression__Group_1__1__Impl
+            // InternalMenuDsl.g:8223:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
+            // InternalMenuDsl.g:8224:2: rule__XAdditiveExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1__Impl();
@@ -27778,23 +28209,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1__Impl"
-    // InternalMenuDsl.g:8099:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:8230: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 {
-            // InternalMenuDsl.g:8103:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:8104:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:8234:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:8235:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:8104:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
-            // InternalMenuDsl.g:8105:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:8235:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:8236:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:8106:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
-            // InternalMenuDsl.g:8106:3: rule__XAdditiveExpression__RightOperandAssignment_1_1
+            // InternalMenuDsl.g:8237:2: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:8237:3: rule__XAdditiveExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__RightOperandAssignment_1_1();
@@ -27829,14 +28260,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0"
-    // InternalMenuDsl.g:8115:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
+    // InternalMenuDsl.g:8246: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 {
-            // InternalMenuDsl.g:8119:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
-            // InternalMenuDsl.g:8120:2: rule__XAdditiveExpression__Group_1_0__0__Impl
+            // InternalMenuDsl.g:8250:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
+            // InternalMenuDsl.g:8251:2: rule__XAdditiveExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0__Impl();
@@ -27862,23 +28293,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:8126:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:8257: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 {
-            // InternalMenuDsl.g:8130:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:8131:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8261:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:8262:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:8131:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:8132:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8262:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8263:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:8133:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:8133:3: rule__XAdditiveExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:8264:2: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8264:3: rule__XAdditiveExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__0();
@@ -27913,16 +28344,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:8142:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:8273: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 {
-            // InternalMenuDsl.g:8146:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
-            // InternalMenuDsl.g:8147:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
+            // InternalMenuDsl.g:8277:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
+            // InternalMenuDsl.g:8278:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_51);
+            pushFollow(FOLLOW_53);
             rule__XAdditiveExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -27951,23 +28382,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:8154:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:8285: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 {
-            // InternalMenuDsl.g:8158:1: ( ( () ) )
-            // InternalMenuDsl.g:8159:1: ( () )
+            // InternalMenuDsl.g:8289:1: ( ( () ) )
+            // InternalMenuDsl.g:8290:1: ( () )
             {
-            // InternalMenuDsl.g:8159:1: ( () )
-            // InternalMenuDsl.g:8160:2: ()
+            // InternalMenuDsl.g:8290:1: ( () )
+            // InternalMenuDsl.g:8291:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:8161:2: ()
-            // InternalMenuDsl.g:8161:3: 
+            // InternalMenuDsl.g:8292:2: ()
+            // InternalMenuDsl.g:8292:3: 
             {
             }
 
@@ -27992,14 +28423,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1"
-    // InternalMenuDsl.g:8169:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:8300: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 {
-            // InternalMenuDsl.g:8173:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:8174:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:8304:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:8305:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1__Impl();
@@ -28025,23 +28456,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:8180:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:8311: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 {
-            // InternalMenuDsl.g:8184:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:8185:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:8315:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:8316:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:8185:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalMenuDsl.g:8186:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:8316:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:8317:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:8187:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
-            // InternalMenuDsl.g:8187:3: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
+            // InternalMenuDsl.g:8318:2: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:8318:3: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__FeatureAssignment_1_0_0_1();
@@ -28076,16 +28507,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0"
-    // InternalMenuDsl.g:8196:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
+    // InternalMenuDsl.g:8327: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 {
-            // InternalMenuDsl.g:8200:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
-            // InternalMenuDsl.g:8201:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
+            // InternalMenuDsl.g:8331:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
+            // InternalMenuDsl.g:8332:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_53);
+            pushFollow(FOLLOW_55);
             rule__XMultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
@@ -28114,17 +28545,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0__Impl"
-    // InternalMenuDsl.g:8208:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
+    // InternalMenuDsl.g:8339:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8212:1: ( ( ruleXUnaryOperation ) )
-            // InternalMenuDsl.g:8213:1: ( ruleXUnaryOperation )
+            // InternalMenuDsl.g:8343:1: ( ( ruleXUnaryOperation ) )
+            // InternalMenuDsl.g:8344:1: ( ruleXUnaryOperation )
             {
-            // InternalMenuDsl.g:8213:1: ( ruleXUnaryOperation )
-            // InternalMenuDsl.g:8214:2: ruleXUnaryOperation
+            // InternalMenuDsl.g:8344:1: ( ruleXUnaryOperation )
+            // InternalMenuDsl.g:8345:2: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
@@ -28159,14 +28590,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1"
-    // InternalMenuDsl.g:8223:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:8354:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8227:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
-            // InternalMenuDsl.g:8228:2: rule__XMultiplicativeExpression__Group__1__Impl
+            // InternalMenuDsl.g:8358:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
+            // InternalMenuDsl.g:8359:2: rule__XMultiplicativeExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1__Impl();
@@ -28192,32 +28623,32 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1__Impl"
-    // InternalMenuDsl.g:8234:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:8365: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 {
-            // InternalMenuDsl.g:8238:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
-            // InternalMenuDsl.g:8239:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:8369:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
+            // InternalMenuDsl.g:8370:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:8239:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
-            // InternalMenuDsl.g:8240:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalMenuDsl.g:8370:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:8371:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:8241:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
-            loop80:
+            // InternalMenuDsl.g:8372:2: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            loop78:
             do {
-                int alt80=2;
+                int alt78=2;
                 switch ( input.LA(1) ) {
                 case 36:
                     {
-                    int LA80_2 = input.LA(2);
+                    int LA78_2 = input.LA(2);
 
-                    if ( (synpred128_InternalMenuDsl()) ) {
-                        alt80=1;
+                    if ( (synpred127_InternalMenuDsl()) ) {
+                        alt78=1;
                     }
 
 
@@ -28225,10 +28656,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 37:
                     {
-                    int LA80_3 = input.LA(2);
+                    int LA78_3 = input.LA(2);
 
-                    if ( (synpred128_InternalMenuDsl()) ) {
-                        alt80=1;
+                    if ( (synpred127_InternalMenuDsl()) ) {
+                        alt78=1;
                     }
 
 
@@ -28236,10 +28667,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 38:
                     {
-                    int LA80_4 = input.LA(2);
+                    int LA78_4 = input.LA(2);
 
-                    if ( (synpred128_InternalMenuDsl()) ) {
-                        alt80=1;
+                    if ( (synpred127_InternalMenuDsl()) ) {
+                        alt78=1;
                     }
 
 
@@ -28247,10 +28678,10 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                     break;
                 case 39:
                     {
-                    int LA80_5 = input.LA(2);
+                    int LA78_5 = input.LA(2);
 
-                    if ( (synpred128_InternalMenuDsl()) ) {
-                        alt80=1;
+                    if ( (synpred127_InternalMenuDsl()) ) {
+                        alt78=1;
                     }
 
 
@@ -28259,11 +28690,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
                 }
 
-                switch (alt80) {
+                switch (alt78) {
             	case 1 :
-            	    // InternalMenuDsl.g:8241:3: rule__XMultiplicativeExpression__Group_1__0
+            	    // InternalMenuDsl.g:8372:3: rule__XMultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_54);
+            	    pushFollow(FOLLOW_56);
             	    rule__XMultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -28273,7 +28704,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop80;
+            	    break loop78;
                 }
             } while (true);
 
@@ -28302,16 +28733,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0"
-    // InternalMenuDsl.g:8250:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
+    // InternalMenuDsl.g:8381: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 {
-            // InternalMenuDsl.g:8254:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
-            // InternalMenuDsl.g:8255:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
+            // InternalMenuDsl.g:8385:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
+            // InternalMenuDsl.g:8386:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XMultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -28340,23 +28771,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0__Impl"
-    // InternalMenuDsl.g:8262:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:8393: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 {
-            // InternalMenuDsl.g:8266:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:8267:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8397:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:8398:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:8267:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
-            // InternalMenuDsl.g:8268:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:8398:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8399:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:8269:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
-            // InternalMenuDsl.g:8269:3: rule__XMultiplicativeExpression__Group_1_0__0
+            // InternalMenuDsl.g:8400:2: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:8400:3: rule__XMultiplicativeExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0();
@@ -28391,14 +28822,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1"
-    // InternalMenuDsl.g:8277:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
+    // InternalMenuDsl.g:8408: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 {
-            // InternalMenuDsl.g:8281:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
-            // InternalMenuDsl.g:8282:2: rule__XMultiplicativeExpression__Group_1__1__Impl
+            // InternalMenuDsl.g:8412:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
+            // InternalMenuDsl.g:8413:2: rule__XMultiplicativeExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1__Impl();
@@ -28424,23 +28855,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1__Impl"
-    // InternalMenuDsl.g:8288:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:8419: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 {
-            // InternalMenuDsl.g:8292:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:8293:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:8423:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:8424:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:8293:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
-            // InternalMenuDsl.g:8294:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:8424:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalMenuDsl.g:8425:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:8295:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
-            // InternalMenuDsl.g:8295:3: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
+            // InternalMenuDsl.g:8426:2: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalMenuDsl.g:8426:3: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__RightOperandAssignment_1_1();
@@ -28475,14 +28906,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0"
-    // InternalMenuDsl.g:8304:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
+    // InternalMenuDsl.g:8435: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 {
-            // InternalMenuDsl.g:8308:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
-            // InternalMenuDsl.g:8309:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
+            // InternalMenuDsl.g:8439:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
+            // InternalMenuDsl.g:8440:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0__Impl();
@@ -28508,23 +28939,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:8315:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:8446: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 {
-            // InternalMenuDsl.g:8319:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:8320:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8450:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:8451:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:8320:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:8321:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8451:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8452:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:8322:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:8322:3: rule__XMultiplicativeExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:8453:2: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8453:3: rule__XMultiplicativeExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__0();
@@ -28559,16 +28990,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:8331:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:8462: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 {
-            // InternalMenuDsl.g:8335:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
-            // InternalMenuDsl.g:8336:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
+            // InternalMenuDsl.g:8466:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
+            // InternalMenuDsl.g:8467:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_53);
+            pushFollow(FOLLOW_55);
             rule__XMultiplicativeExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -28597,23 +29028,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:8343:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:8474: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 {
-            // InternalMenuDsl.g:8347:1: ( ( () ) )
-            // InternalMenuDsl.g:8348:1: ( () )
+            // InternalMenuDsl.g:8478:1: ( ( () ) )
+            // InternalMenuDsl.g:8479:1: ( () )
             {
-            // InternalMenuDsl.g:8348:1: ( () )
-            // InternalMenuDsl.g:8349:2: ()
+            // InternalMenuDsl.g:8479:1: ( () )
+            // InternalMenuDsl.g:8480:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:8350:2: ()
-            // InternalMenuDsl.g:8350:3: 
+            // InternalMenuDsl.g:8481:2: ()
+            // InternalMenuDsl.g:8481:3: 
             {
             }
 
@@ -28638,14 +29069,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1"
-    // InternalMenuDsl.g:8358:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:8489: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 {
-            // InternalMenuDsl.g:8362:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:8363:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:8493:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:8494:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1__Impl();
@@ -28671,23 +29102,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:8369:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:8500: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 {
-            // InternalMenuDsl.g:8373:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:8374:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:8504:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:8505:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:8374:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
-            // InternalMenuDsl.g:8375:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:8505:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalMenuDsl.g:8506:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:8376:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
-            // InternalMenuDsl.g:8376:3: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
+            // InternalMenuDsl.g:8507:2: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalMenuDsl.g:8507:3: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1();
@@ -28722,16 +29153,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0"
-    // InternalMenuDsl.g:8385:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
+    // InternalMenuDsl.g:8516: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 {
-            // InternalMenuDsl.g:8389:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
-            // InternalMenuDsl.g:8390:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
+            // InternalMenuDsl.g:8520:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
+            // InternalMenuDsl.g:8521:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_55);
+            pushFollow(FOLLOW_57);
             rule__XUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
@@ -28760,23 +29191,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0__Impl"
-    // InternalMenuDsl.g:8397:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:8528:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8401:1: ( ( () ) )
-            // InternalMenuDsl.g:8402:1: ( () )
+            // InternalMenuDsl.g:8532:1: ( ( () ) )
+            // InternalMenuDsl.g:8533:1: ( () )
             {
-            // InternalMenuDsl.g:8402:1: ( () )
-            // InternalMenuDsl.g:8403:2: ()
+            // InternalMenuDsl.g:8533:1: ( () )
+            // InternalMenuDsl.g:8534:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // InternalMenuDsl.g:8404:2: ()
-            // InternalMenuDsl.g:8404:3: 
+            // InternalMenuDsl.g:8535:2: ()
+            // InternalMenuDsl.g:8535:3: 
             {
             }
 
@@ -28801,16 +29232,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1"
-    // InternalMenuDsl.g:8412:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
+    // InternalMenuDsl.g:8543: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 {
-            // InternalMenuDsl.g:8416:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
-            // InternalMenuDsl.g:8417:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
+            // InternalMenuDsl.g:8547:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
+            // InternalMenuDsl.g:8548:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
@@ -28839,23 +29270,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1__Impl"
-    // InternalMenuDsl.g:8424:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // InternalMenuDsl.g:8555: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 {
-            // InternalMenuDsl.g:8428:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // InternalMenuDsl.g:8429:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalMenuDsl.g:8559:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // InternalMenuDsl.g:8560:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // InternalMenuDsl.g:8429:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
-            // InternalMenuDsl.g:8430:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalMenuDsl.g:8560:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalMenuDsl.g:8561:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // InternalMenuDsl.g:8431:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
-            // InternalMenuDsl.g:8431:3: rule__XUnaryOperation__FeatureAssignment_0_1
+            // InternalMenuDsl.g:8562:2: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalMenuDsl.g:8562:3: rule__XUnaryOperation__FeatureAssignment_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XUnaryOperation__FeatureAssignment_0_1();
@@ -28890,14 +29321,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2"
-    // InternalMenuDsl.g:8439:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
+    // InternalMenuDsl.g:8570: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 {
-            // InternalMenuDsl.g:8443:1: ( rule__XUnaryOperation__Group_0__2__Impl )
-            // InternalMenuDsl.g:8444:2: rule__XUnaryOperation__Group_0__2__Impl
+            // InternalMenuDsl.g:8574:1: ( rule__XUnaryOperation__Group_0__2__Impl )
+            // InternalMenuDsl.g:8575:2: rule__XUnaryOperation__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2__Impl();
@@ -28923,23 +29354,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2__Impl"
-    // InternalMenuDsl.g:8450:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // InternalMenuDsl.g:8581: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 {
-            // InternalMenuDsl.g:8454:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
-            // InternalMenuDsl.g:8455:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalMenuDsl.g:8585:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
+            // InternalMenuDsl.g:8586:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // InternalMenuDsl.g:8455:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
-            // InternalMenuDsl.g:8456:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalMenuDsl.g:8586:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalMenuDsl.g:8587:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // InternalMenuDsl.g:8457:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
-            // InternalMenuDsl.g:8457:3: rule__XUnaryOperation__OperandAssignment_0_2
+            // InternalMenuDsl.g:8588:2: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalMenuDsl.g:8588:3: rule__XUnaryOperation__OperandAssignment_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XUnaryOperation__OperandAssignment_0_2();
@@ -28974,16 +29405,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0"
-    // InternalMenuDsl.g:8466:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
+    // InternalMenuDsl.g:8597: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 {
-            // InternalMenuDsl.g:8470:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
-            // InternalMenuDsl.g:8471:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
+            // InternalMenuDsl.g:8601:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
+            // InternalMenuDsl.g:8602:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
             {
-            pushFollow(FOLLOW_56);
+            pushFollow(FOLLOW_58);
             rule__XCastedExpression__Group__0__Impl();
 
             state._fsp--;
@@ -29012,17 +29443,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0__Impl"
-    // InternalMenuDsl.g:8478:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
+    // InternalMenuDsl.g:8609:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
     public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8482:1: ( ( ruleXPostfixOperation ) )
-            // InternalMenuDsl.g:8483:1: ( ruleXPostfixOperation )
+            // InternalMenuDsl.g:8613:1: ( ( ruleXPostfixOperation ) )
+            // InternalMenuDsl.g:8614:1: ( ruleXPostfixOperation )
             {
-            // InternalMenuDsl.g:8483:1: ( ruleXPostfixOperation )
-            // InternalMenuDsl.g:8484:2: ruleXPostfixOperation
+            // InternalMenuDsl.g:8614:1: ( ruleXPostfixOperation )
+            // InternalMenuDsl.g:8615:2: ruleXPostfixOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
@@ -29057,14 +29488,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1"
-    // InternalMenuDsl.g:8493:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
+    // InternalMenuDsl.g:8624:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
     public final void rule__XCastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8497:1: ( rule__XCastedExpression__Group__1__Impl )
-            // InternalMenuDsl.g:8498:2: rule__XCastedExpression__Group__1__Impl
+            // InternalMenuDsl.g:8628:1: ( rule__XCastedExpression__Group__1__Impl )
+            // InternalMenuDsl.g:8629:2: rule__XCastedExpression__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1__Impl();
@@ -29090,43 +29521,43 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1__Impl"
-    // InternalMenuDsl.g:8504:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:8635: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 {
-            // InternalMenuDsl.g:8508:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
-            // InternalMenuDsl.g:8509:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:8639:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
+            // InternalMenuDsl.g:8640:1: ( ( rule__XCastedExpression__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:8509:1: ( ( rule__XCastedExpression__Group_1__0 )* )
-            // InternalMenuDsl.g:8510:2: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalMenuDsl.g:8640:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalMenuDsl.g:8641:2: ( rule__XCastedExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:8511:2: ( rule__XCastedExpression__Group_1__0 )*
-            loop81:
+            // InternalMenuDsl.g:8642:2: ( rule__XCastedExpression__Group_1__0 )*
+            loop79:
             do {
-                int alt81=2;
-                int LA81_0 = input.LA(1);
+                int alt79=2;
+                int LA79_0 = input.LA(1);
 
-                if ( (LA81_0==68) ) {
-                    int LA81_2 = input.LA(2);
+                if ( (LA79_0==70) ) {
+                    int LA79_2 = input.LA(2);
 
-                    if ( (synpred129_InternalMenuDsl()) ) {
-                        alt81=1;
+                    if ( (synpred128_InternalMenuDsl()) ) {
+                        alt79=1;
                     }
 
 
                 }
 
 
-                switch (alt81) {
+                switch (alt79) {
             	case 1 :
-            	    // InternalMenuDsl.g:8511:3: rule__XCastedExpression__Group_1__0
+            	    // InternalMenuDsl.g:8642:3: rule__XCastedExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_57);
+            	    pushFollow(FOLLOW_59);
             	    rule__XCastedExpression__Group_1__0();
 
             	    state._fsp--;
@@ -29136,7 +29567,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop81;
+            	    break loop79;
                 }
             } while (true);
 
@@ -29165,16 +29596,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0"
-    // InternalMenuDsl.g:8520:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
+    // InternalMenuDsl.g:8651: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 {
-            // InternalMenuDsl.g:8524:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
-            // InternalMenuDsl.g:8525:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
+            // InternalMenuDsl.g:8655:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
+            // InternalMenuDsl.g:8656:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XCastedExpression__Group_1__0__Impl();
 
             state._fsp--;
@@ -29203,23 +29634,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0__Impl"
-    // InternalMenuDsl.g:8532:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:8663: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 {
-            // InternalMenuDsl.g:8536:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:8537:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8667:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:8668:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:8537:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
-            // InternalMenuDsl.g:8538:2: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:8668:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8669:2: ( rule__XCastedExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:8539:2: ( rule__XCastedExpression__Group_1_0__0 )
-            // InternalMenuDsl.g:8539:3: rule__XCastedExpression__Group_1_0__0
+            // InternalMenuDsl.g:8670:2: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalMenuDsl.g:8670:3: rule__XCastedExpression__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0();
@@ -29254,14 +29685,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1"
-    // InternalMenuDsl.g:8547:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
+    // InternalMenuDsl.g:8678: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 {
-            // InternalMenuDsl.g:8551:1: ( rule__XCastedExpression__Group_1__1__Impl )
-            // InternalMenuDsl.g:8552:2: rule__XCastedExpression__Group_1__1__Impl
+            // InternalMenuDsl.g:8682:1: ( rule__XCastedExpression__Group_1__1__Impl )
+            // InternalMenuDsl.g:8683:2: rule__XCastedExpression__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1__Impl();
@@ -29287,23 +29718,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1__Impl"
-    // InternalMenuDsl.g:8558:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:8689: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 {
-            // InternalMenuDsl.g:8562:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:8563:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalMenuDsl.g:8693:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:8694:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:8563:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
-            // InternalMenuDsl.g:8564:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalMenuDsl.g:8694:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalMenuDsl.g:8695:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:8565:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
-            // InternalMenuDsl.g:8565:3: rule__XCastedExpression__TypeAssignment_1_1
+            // InternalMenuDsl.g:8696:2: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalMenuDsl.g:8696:3: rule__XCastedExpression__TypeAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__TypeAssignment_1_1();
@@ -29338,14 +29769,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0"
-    // InternalMenuDsl.g:8574:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
+    // InternalMenuDsl.g:8705: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 {
-            // InternalMenuDsl.g:8578:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
-            // InternalMenuDsl.g:8579:2: rule__XCastedExpression__Group_1_0__0__Impl
+            // InternalMenuDsl.g:8709:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
+            // InternalMenuDsl.g:8710:2: rule__XCastedExpression__Group_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0__Impl();
@@ -29371,23 +29802,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:8585:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:8716: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 {
-            // InternalMenuDsl.g:8589:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:8590:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8720:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:8721:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:8590:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:8591:2: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8721:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8722:2: ( rule__XCastedExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:8592:2: ( rule__XCastedExpression__Group_1_0_0__0 )
-            // InternalMenuDsl.g:8592:3: rule__XCastedExpression__Group_1_0_0__0
+            // InternalMenuDsl.g:8723:2: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8723:3: rule__XCastedExpression__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__0();
@@ -29422,16 +29853,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0"
-    // InternalMenuDsl.g:8601:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:8732: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 {
-            // InternalMenuDsl.g:8605:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
-            // InternalMenuDsl.g:8606:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
+            // InternalMenuDsl.g:8736:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
+            // InternalMenuDsl.g:8737:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_56);
+            pushFollow(FOLLOW_58);
             rule__XCastedExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -29460,23 +29891,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:8613:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:8744: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 {
-            // InternalMenuDsl.g:8617:1: ( ( () ) )
-            // InternalMenuDsl.g:8618:1: ( () )
+            // InternalMenuDsl.g:8748:1: ( ( () ) )
+            // InternalMenuDsl.g:8749:1: ( () )
             {
-            // InternalMenuDsl.g:8618:1: ( () )
-            // InternalMenuDsl.g:8619:2: ()
+            // InternalMenuDsl.g:8749:1: ( () )
+            // InternalMenuDsl.g:8750:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:8620:2: ()
-            // InternalMenuDsl.g:8620:3: 
+            // InternalMenuDsl.g:8751:2: ()
+            // InternalMenuDsl.g:8751:3: 
             {
             }
 
@@ -29501,14 +29932,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1"
-    // InternalMenuDsl.g:8628:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:8759: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 {
-            // InternalMenuDsl.g:8632:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:8633:2: rule__XCastedExpression__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:8763:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:8764:2: rule__XCastedExpression__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1__Impl();
@@ -29534,22 +29965,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:8639:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
+    // InternalMenuDsl.g:8770: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 {
-            // InternalMenuDsl.g:8643:1: ( ( 'as' ) )
-            // InternalMenuDsl.g:8644:1: ( 'as' )
+            // InternalMenuDsl.g:8774:1: ( ( 'as' ) )
+            // InternalMenuDsl.g:8775:1: ( 'as' )
             {
-            // InternalMenuDsl.g:8644:1: ( 'as' )
-            // InternalMenuDsl.g:8645:2: 'as'
+            // InternalMenuDsl.g:8775:1: ( 'as' )
+            // InternalMenuDsl.g:8776:2: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
-            match(input,68,FOLLOW_2); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
@@ -29575,16 +30006,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0"
-    // InternalMenuDsl.g:8655:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
+    // InternalMenuDsl.g:8786: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 {
-            // InternalMenuDsl.g:8659:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
-            // InternalMenuDsl.g:8660:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
+            // InternalMenuDsl.g:8790:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
+            // InternalMenuDsl.g:8791:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
             {
-            pushFollow(FOLLOW_58);
+            pushFollow(FOLLOW_60);
             rule__XPostfixOperation__Group__0__Impl();
 
             state._fsp--;
@@ -29613,17 +30044,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0__Impl"
-    // InternalMenuDsl.g:8667:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
+    // InternalMenuDsl.g:8798:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
     public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8671:1: ( ( ruleXMemberFeatureCall ) )
-            // InternalMenuDsl.g:8672:1: ( ruleXMemberFeatureCall )
+            // InternalMenuDsl.g:8802:1: ( ( ruleXMemberFeatureCall ) )
+            // InternalMenuDsl.g:8803:1: ( ruleXMemberFeatureCall )
             {
-            // InternalMenuDsl.g:8672:1: ( ruleXMemberFeatureCall )
-            // InternalMenuDsl.g:8673:2: ruleXMemberFeatureCall
+            // InternalMenuDsl.g:8803:1: ( ruleXMemberFeatureCall )
+            // InternalMenuDsl.g:8804:2: ruleXMemberFeatureCall
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
@@ -29658,14 +30089,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1"
-    // InternalMenuDsl.g:8682:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
+    // InternalMenuDsl.g:8813:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
     public final void rule__XPostfixOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8686:1: ( rule__XPostfixOperation__Group__1__Impl )
-            // InternalMenuDsl.g:8687:2: rule__XPostfixOperation__Group__1__Impl
+            // InternalMenuDsl.g:8817:1: ( rule__XPostfixOperation__Group__1__Impl )
+            // InternalMenuDsl.g:8818:2: rule__XPostfixOperation__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1__Impl();
@@ -29691,42 +30122,42 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1__Impl"
-    // InternalMenuDsl.g:8693:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
+    // InternalMenuDsl.g:8824: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 {
-            // InternalMenuDsl.g:8697:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
-            // InternalMenuDsl.g:8698:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalMenuDsl.g:8828:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
+            // InternalMenuDsl.g:8829:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
             {
-            // InternalMenuDsl.g:8698:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
-            // InternalMenuDsl.g:8699:2: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalMenuDsl.g:8829:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalMenuDsl.g:8830:2: ( rule__XPostfixOperation__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:8700:2: ( rule__XPostfixOperation__Group_1__0 )?
-            int alt82=2;
-            int LA82_0 = input.LA(1);
+            // InternalMenuDsl.g:8831:2: ( rule__XPostfixOperation__Group_1__0 )?
+            int alt80=2;
+            int LA80_0 = input.LA(1);
 
-            if ( (LA82_0==41) ) {
-                int LA82_1 = input.LA(2);
+            if ( (LA80_0==41) ) {
+                int LA80_1 = input.LA(2);
 
-                if ( (synpred130_InternalMenuDsl()) ) {
-                    alt82=1;
+                if ( (synpred129_InternalMenuDsl()) ) {
+                    alt80=1;
                 }
             }
-            else if ( (LA82_0==42) ) {
-                int LA82_2 = input.LA(2);
+            else if ( (LA80_0==42) ) {
+                int LA80_2 = input.LA(2);
 
-                if ( (synpred130_InternalMenuDsl()) ) {
-                    alt82=1;
+                if ( (synpred129_InternalMenuDsl()) ) {
+                    alt80=1;
                 }
             }
-            switch (alt82) {
+            switch (alt80) {
                 case 1 :
-                    // InternalMenuDsl.g:8700:3: rule__XPostfixOperation__Group_1__0
+                    // InternalMenuDsl.g:8831:3: rule__XPostfixOperation__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XPostfixOperation__Group_1__0();
@@ -29764,14 +30195,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0"
-    // InternalMenuDsl.g:8709:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
+    // InternalMenuDsl.g:8840: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 {
-            // InternalMenuDsl.g:8713:1: ( rule__XPostfixOperation__Group_1__0__Impl )
-            // InternalMenuDsl.g:8714:2: rule__XPostfixOperation__Group_1__0__Impl
+            // InternalMenuDsl.g:8844:1: ( rule__XPostfixOperation__Group_1__0__Impl )
+            // InternalMenuDsl.g:8845:2: rule__XPostfixOperation__Group_1__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1__0__Impl();
@@ -29797,23 +30228,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0__Impl"
-    // InternalMenuDsl.g:8720:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:8851: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 {
-            // InternalMenuDsl.g:8724:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:8725:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8855:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:8856:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:8725:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
-            // InternalMenuDsl.g:8726:2: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalMenuDsl.g:8856:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalMenuDsl.g:8857:2: ( rule__XPostfixOperation__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:8727:2: ( rule__XPostfixOperation__Group_1_0__0 )
-            // InternalMenuDsl.g:8727:3: rule__XPostfixOperation__Group_1_0__0
+            // InternalMenuDsl.g:8858:2: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalMenuDsl.g:8858:3: rule__XPostfixOperation__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__0();
@@ -29848,16 +30279,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0"
-    // InternalMenuDsl.g:8736:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
+    // InternalMenuDsl.g:8867: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 {
-            // InternalMenuDsl.g:8740:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
-            // InternalMenuDsl.g:8741:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
+            // InternalMenuDsl.g:8871:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
+            // InternalMenuDsl.g:8872:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
             {
-            pushFollow(FOLLOW_58);
+            pushFollow(FOLLOW_60);
             rule__XPostfixOperation__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -29886,23 +30317,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:8748:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:8879:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
     public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8752:1: ( ( () ) )
-            // InternalMenuDsl.g:8753:1: ( () )
+            // InternalMenuDsl.g:8883:1: ( ( () ) )
+            // InternalMenuDsl.g:8884:1: ( () )
             {
-            // InternalMenuDsl.g:8753:1: ( () )
-            // InternalMenuDsl.g:8754:2: ()
+            // InternalMenuDsl.g:8884:1: ( () )
+            // InternalMenuDsl.g:8885:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()); 
             }
-            // InternalMenuDsl.g:8755:2: ()
-            // InternalMenuDsl.g:8755:3: 
+            // InternalMenuDsl.g:8886:2: ()
+            // InternalMenuDsl.g:8886:3: 
             {
             }
 
@@ -29927,14 +30358,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1"
-    // InternalMenuDsl.g:8763:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
+    // InternalMenuDsl.g:8894: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 {
-            // InternalMenuDsl.g:8767:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
-            // InternalMenuDsl.g:8768:2: rule__XPostfixOperation__Group_1_0__1__Impl
+            // InternalMenuDsl.g:8898:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
+            // InternalMenuDsl.g:8899:2: rule__XPostfixOperation__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1__Impl();
@@ -29960,23 +30391,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1__Impl"
-    // InternalMenuDsl.g:8774:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
+    // InternalMenuDsl.g:8905: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 {
-            // InternalMenuDsl.g:8778:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
-            // InternalMenuDsl.g:8779:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:8909:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
+            // InternalMenuDsl.g:8910:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
             {
-            // InternalMenuDsl.g:8779:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
-            // InternalMenuDsl.g:8780:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalMenuDsl.g:8910:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:8911:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureAssignment_1_0_1()); 
             }
-            // InternalMenuDsl.g:8781:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
-            // InternalMenuDsl.g:8781:3: rule__XPostfixOperation__FeatureAssignment_1_0_1
+            // InternalMenuDsl.g:8912:2: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalMenuDsl.g:8912:3: rule__XPostfixOperation__FeatureAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XPostfixOperation__FeatureAssignment_1_0_1();
@@ -30011,16 +30442,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0"
-    // InternalMenuDsl.g:8790:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
+    // InternalMenuDsl.g:8921: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 {
-            // InternalMenuDsl.g:8794:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
-            // InternalMenuDsl.g:8795:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
+            // InternalMenuDsl.g:8925:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
+            // InternalMenuDsl.g:8926:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_59);
+            pushFollow(FOLLOW_61);
             rule__XMemberFeatureCall__Group__0__Impl();
 
             state._fsp--;
@@ -30049,17 +30480,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0__Impl"
-    // InternalMenuDsl.g:8802:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
+    // InternalMenuDsl.g:8933:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
     public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8806:1: ( ( ruleXPrimaryExpression ) )
-            // InternalMenuDsl.g:8807:1: ( ruleXPrimaryExpression )
+            // InternalMenuDsl.g:8937:1: ( ( ruleXPrimaryExpression ) )
+            // InternalMenuDsl.g:8938:1: ( ruleXPrimaryExpression )
             {
-            // InternalMenuDsl.g:8807:1: ( ruleXPrimaryExpression )
-            // InternalMenuDsl.g:8808:2: ruleXPrimaryExpression
+            // InternalMenuDsl.g:8938:1: ( ruleXPrimaryExpression )
+            // InternalMenuDsl.g:8939:2: ruleXPrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
@@ -30094,14 +30525,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1"
-    // InternalMenuDsl.g:8817:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
+    // InternalMenuDsl.g:8948:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
     public final void rule__XMemberFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8821:1: ( rule__XMemberFeatureCall__Group__1__Impl )
-            // InternalMenuDsl.g:8822:2: rule__XMemberFeatureCall__Group__1__Impl
+            // InternalMenuDsl.g:8952:1: ( rule__XMemberFeatureCall__Group__1__Impl )
+            // InternalMenuDsl.g:8953:2: rule__XMemberFeatureCall__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1__Impl();
@@ -30127,54 +30558,54 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1__Impl"
-    // InternalMenuDsl.g:8828:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
+    // InternalMenuDsl.g:8959:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
     public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:8832:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
-            // InternalMenuDsl.g:8833:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalMenuDsl.g:8963:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
+            // InternalMenuDsl.g:8964:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
             {
-            // InternalMenuDsl.g:8833:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
-            // InternalMenuDsl.g:8834:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalMenuDsl.g:8964:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalMenuDsl.g:8965:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1()); 
             }
-            // InternalMenuDsl.g:8835:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
-            loop83:
+            // InternalMenuDsl.g:8966:2: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            loop81:
             do {
-                int alt83=2;
+                int alt81=2;
                 switch ( input.LA(1) ) {
                 case 43:
                     {
-                    int LA83_2 = input.LA(2);
+                    int LA81_2 = input.LA(2);
 
-                    if ( (synpred131_InternalMenuDsl()) ) {
-                        alt83=1;
+                    if ( (synpred130_InternalMenuDsl()) ) {
+                        alt81=1;
                     }
 
 
                     }
                     break;
-                case 101:
+                case 103:
                     {
-                    int LA83_3 = input.LA(2);
+                    int LA81_3 = input.LA(2);
 
-                    if ( (synpred131_InternalMenuDsl()) ) {
-                        alt83=1;
+                    if ( (synpred130_InternalMenuDsl()) ) {
+                        alt81=1;
                     }
 
 
                     }
                     break;
-                case 102:
+                case 104:
                     {
-                    int LA83_4 = input.LA(2);
+                    int LA81_4 = input.LA(2);
 
-                    if ( (synpred131_InternalMenuDsl()) ) {
-                        alt83=1;
+                    if ( (synpred130_InternalMenuDsl()) ) {
+                        alt81=1;
                     }
 
 
@@ -30183,11 +30614,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
                 }
 
-                switch (alt83) {
+                switch (alt81) {
             	case 1 :
-            	    // InternalMenuDsl.g:8835:3: rule__XMemberFeatureCall__Alternatives_1
+            	    // InternalMenuDsl.g:8966:3: rule__XMemberFeatureCall__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_60);
+            	    pushFollow(FOLLOW_62);
             	    rule__XMemberFeatureCall__Alternatives_1();
 
             	    state._fsp--;
@@ -30197,7 +30628,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop83;
+            	    break loop81;
                 }
             } while (true);
 
@@ -30226,16 +30657,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0"
-    // InternalMenuDsl.g:8844:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
+    // InternalMenuDsl.g:8975: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 {
-            // InternalMenuDsl.g:8848:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
-            // InternalMenuDsl.g:8849:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
+            // InternalMenuDsl.g:8979:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
+            // InternalMenuDsl.g:8980:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XMemberFeatureCall__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -30264,23 +30695,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:8856:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:8987: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 {
-            // InternalMenuDsl.g:8860:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:8861:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8991:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:8992:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:8861:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
-            // InternalMenuDsl.g:8862:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8992:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalMenuDsl.g:8993:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:8863:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
-            // InternalMenuDsl.g:8863:3: rule__XMemberFeatureCall__Group_1_0_0__0
+            // InternalMenuDsl.g:8994:2: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalMenuDsl.g:8994:3: rule__XMemberFeatureCall__Group_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0();
@@ -30315,14 +30746,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1"
-    // InternalMenuDsl.g:8871:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
+    // InternalMenuDsl.g:9002: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 {
-            // InternalMenuDsl.g:8875:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
-            // InternalMenuDsl.g:8876:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
+            // InternalMenuDsl.g:9006:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
+            // InternalMenuDsl.g:9007:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1__Impl();
@@ -30348,23 +30779,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1__Impl"
-    // InternalMenuDsl.g:8882:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
+    // InternalMenuDsl.g:9013: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 {
-            // InternalMenuDsl.g:8886:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
-            // InternalMenuDsl.g:8887:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:9017:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
+            // InternalMenuDsl.g:9018:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
             {
-            // InternalMenuDsl.g:8887:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
-            // InternalMenuDsl.g:8888:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalMenuDsl.g:9018:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:9019:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueAssignment_1_0_1()); 
             }
-            // InternalMenuDsl.g:8889:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
-            // InternalMenuDsl.g:8889:3: rule__XMemberFeatureCall__ValueAssignment_1_0_1
+            // InternalMenuDsl.g:9020:2: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalMenuDsl.g:9020:3: rule__XMemberFeatureCall__ValueAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ValueAssignment_1_0_1();
@@ -30399,14 +30830,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0"
-    // InternalMenuDsl.g:8898:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
+    // InternalMenuDsl.g:9029: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 {
-            // InternalMenuDsl.g:8902:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
-            // InternalMenuDsl.g:8903:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
+            // InternalMenuDsl.g:9033:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
+            // InternalMenuDsl.g:9034:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0__Impl();
@@ -30432,23 +30863,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:8909:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
+    // InternalMenuDsl.g:9040: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 {
-            // InternalMenuDsl.g:8913:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
-            // InternalMenuDsl.g:8914:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalMenuDsl.g:9044:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
+            // InternalMenuDsl.g:9045:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
             {
-            // InternalMenuDsl.g:8914:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
-            // InternalMenuDsl.g:8915:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalMenuDsl.g:9045:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalMenuDsl.g:9046:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:8916:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
-            // InternalMenuDsl.g:8916:3: rule__XMemberFeatureCall__Group_1_0_0_0__0
+            // InternalMenuDsl.g:9047:2: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalMenuDsl.g:9047:3: rule__XMemberFeatureCall__Group_1_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__0();
@@ -30483,16 +30914,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0"
-    // InternalMenuDsl.g:8925: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 ;
+    // InternalMenuDsl.g:9056: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 {
-            // InternalMenuDsl.g:8929:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
-            // InternalMenuDsl.g:8930:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
+            // InternalMenuDsl.g:9060:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
+            // InternalMenuDsl.g:9061:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_61);
+            pushFollow(FOLLOW_63);
             rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
@@ -30521,23 +30952,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl"
-    // InternalMenuDsl.g:8937:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:9068: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 {
-            // InternalMenuDsl.g:8941:1: ( ( () ) )
-            // InternalMenuDsl.g:8942:1: ( () )
+            // InternalMenuDsl.g:9072:1: ( ( () ) )
+            // InternalMenuDsl.g:9073:1: ( () )
             {
-            // InternalMenuDsl.g:8942:1: ( () )
-            // InternalMenuDsl.g:8943:2: ()
+            // InternalMenuDsl.g:9073:1: ( () )
+            // InternalMenuDsl.g:9074:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()); 
             }
-            // InternalMenuDsl.g:8944:2: ()
-            // InternalMenuDsl.g:8944:3: 
+            // InternalMenuDsl.g:9075:2: ()
+            // InternalMenuDsl.g:9075:3: 
             {
             }
 
@@ -30562,16 +30993,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1"
-    // InternalMenuDsl.g:8952: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 ;
+    // InternalMenuDsl.g:9083: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 {
-            // InternalMenuDsl.g:8956:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
-            // InternalMenuDsl.g:8957:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
+            // InternalMenuDsl.g:9087:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
+            // InternalMenuDsl.g:9088:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
             {
-            pushFollow(FOLLOW_32);
+            pushFollow(FOLLOW_34);
             rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
@@ -30600,23 +31031,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl"
-    // InternalMenuDsl.g:8964:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
+    // InternalMenuDsl.g:9095: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 {
-            // InternalMenuDsl.g:8968:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
-            // InternalMenuDsl.g:8969:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalMenuDsl.g:9099:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
+            // InternalMenuDsl.g:9100:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
             {
-            // InternalMenuDsl.g:8969:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
-            // InternalMenuDsl.g:8970:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalMenuDsl.g:9100:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalMenuDsl.g:9101:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_0_0_0_1()); 
             }
-            // InternalMenuDsl.g:8971:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
-            // InternalMenuDsl.g:8971:3: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
+            // InternalMenuDsl.g:9102:2: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalMenuDsl.g:9102:3: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_0_0_0_1();
@@ -30651,16 +31082,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2"
-    // InternalMenuDsl.g:8979: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 ;
+    // InternalMenuDsl.g:9110: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 {
-            // InternalMenuDsl.g:8983:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
-            // InternalMenuDsl.g:8984:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
+            // InternalMenuDsl.g:9114:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
+            // InternalMenuDsl.g:9115:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl();
 
             state._fsp--;
@@ -30689,23 +31120,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl"
-    // InternalMenuDsl.g:8991:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
+    // InternalMenuDsl.g:9122: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 {
-            // InternalMenuDsl.g:8995:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
-            // InternalMenuDsl.g:8996:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalMenuDsl.g:9126:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
+            // InternalMenuDsl.g:9127:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
             {
-            // InternalMenuDsl.g:8996:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
-            // InternalMenuDsl.g:8997:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalMenuDsl.g:9127:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalMenuDsl.g:9128:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_0_0_0_2()); 
             }
-            // InternalMenuDsl.g:8998:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
-            // InternalMenuDsl.g:8998:3: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
+            // InternalMenuDsl.g:9129:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalMenuDsl.g:9129:3: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2();
@@ -30740,14 +31171,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3"
-    // InternalMenuDsl.g:9006:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
+    // InternalMenuDsl.g:9137: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 {
-            // InternalMenuDsl.g:9010:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
-            // InternalMenuDsl.g:9011:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
+            // InternalMenuDsl.g:9141:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
+            // InternalMenuDsl.g:9142:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl();
@@ -30773,17 +31204,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl"
-    // InternalMenuDsl.g:9017:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
+    // InternalMenuDsl.g:9148: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 {
-            // InternalMenuDsl.g:9021:1: ( ( ruleOpSingleAssign ) )
-            // InternalMenuDsl.g:9022:1: ( ruleOpSingleAssign )
+            // InternalMenuDsl.g:9152:1: ( ( ruleOpSingleAssign ) )
+            // InternalMenuDsl.g:9153:1: ( ruleOpSingleAssign )
             {
-            // InternalMenuDsl.g:9022:1: ( ruleOpSingleAssign )
-            // InternalMenuDsl.g:9023:2: ruleOpSingleAssign
+            // InternalMenuDsl.g:9153:1: ( ruleOpSingleAssign )
+            // InternalMenuDsl.g:9154:2: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
@@ -30818,16 +31249,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0"
-    // InternalMenuDsl.g:9033:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
+    // InternalMenuDsl.g:9164: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 {
-            // InternalMenuDsl.g:9037:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
-            // InternalMenuDsl.g:9038:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
+            // InternalMenuDsl.g:9168:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
+            // InternalMenuDsl.g:9169:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
             {
-            pushFollow(FOLLOW_62);
+            pushFollow(FOLLOW_64);
             rule__XMemberFeatureCall__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -30856,23 +31287,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0__Impl"
-    // InternalMenuDsl.g:9045:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
+    // InternalMenuDsl.g:9176: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 {
-            // InternalMenuDsl.g:9049:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
-            // InternalMenuDsl.g:9050:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalMenuDsl.g:9180:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
+            // InternalMenuDsl.g:9181:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
             {
-            // InternalMenuDsl.g:9050:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
-            // InternalMenuDsl.g:9051:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalMenuDsl.g:9181:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalMenuDsl.g:9182:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0()); 
             }
-            // InternalMenuDsl.g:9052:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
-            // InternalMenuDsl.g:9052:3: rule__XMemberFeatureCall__Group_1_1_0__0
+            // InternalMenuDsl.g:9183:2: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalMenuDsl.g:9183:3: rule__XMemberFeatureCall__Group_1_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0();
@@ -30907,16 +31338,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1"
-    // InternalMenuDsl.g:9060:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
+    // InternalMenuDsl.g:9191: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 {
-            // InternalMenuDsl.g:9064:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
-            // InternalMenuDsl.g:9065:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
+            // InternalMenuDsl.g:9195:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
+            // InternalMenuDsl.g:9196:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
             {
-            pushFollow(FOLLOW_62);
+            pushFollow(FOLLOW_64);
             rule__XMemberFeatureCall__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -30945,31 +31376,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1__Impl"
-    // InternalMenuDsl.g:9072:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
+    // InternalMenuDsl.g:9203: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 {
-            // InternalMenuDsl.g:9076:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
-            // InternalMenuDsl.g:9077:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalMenuDsl.g:9207:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
+            // InternalMenuDsl.g:9208:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
             {
-            // InternalMenuDsl.g:9077:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
-            // InternalMenuDsl.g:9078:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalMenuDsl.g:9208:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalMenuDsl.g:9209:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1()); 
             }
-            // InternalMenuDsl.g:9079:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
-            int alt84=2;
-            int LA84_0 = input.LA(1);
+            // InternalMenuDsl.g:9210:2: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            int alt82=2;
+            int LA82_0 = input.LA(1);
 
-            if ( (LA84_0==27) ) {
-                alt84=1;
+            if ( (LA82_0==27) ) {
+                alt82=1;
             }
-            switch (alt84) {
+            switch (alt82) {
                 case 1 :
-                    // InternalMenuDsl.g:9079:3: rule__XMemberFeatureCall__Group_1_1_1__0
+                    // InternalMenuDsl.g:9210:3: rule__XMemberFeatureCall__Group_1_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_1__0();
@@ -31007,16 +31438,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2"
-    // InternalMenuDsl.g:9087:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
+    // InternalMenuDsl.g:9218: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 {
-            // InternalMenuDsl.g:9091:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
-            // InternalMenuDsl.g:9092:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
+            // InternalMenuDsl.g:9222:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
+            // InternalMenuDsl.g:9223:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
             {
-            pushFollow(FOLLOW_63);
+            pushFollow(FOLLOW_65);
             rule__XMemberFeatureCall__Group_1_1__2__Impl();
 
             state._fsp--;
@@ -31045,23 +31476,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2__Impl"
-    // InternalMenuDsl.g:9099:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
+    // InternalMenuDsl.g:9230: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 {
-            // InternalMenuDsl.g:9103:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
-            // InternalMenuDsl.g:9104:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalMenuDsl.g:9234:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
+            // InternalMenuDsl.g:9235:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
             {
-            // InternalMenuDsl.g:9104:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
-            // InternalMenuDsl.g:9105:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalMenuDsl.g:9235:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalMenuDsl.g:9236:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_1_2()); 
             }
-            // InternalMenuDsl.g:9106:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
-            // InternalMenuDsl.g:9106:3: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
+            // InternalMenuDsl.g:9237:2: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalMenuDsl.g:9237:3: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_1_2();
@@ -31096,16 +31527,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3"
-    // InternalMenuDsl.g:9114:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
+    // InternalMenuDsl.g:9245: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 {
-            // InternalMenuDsl.g:9118:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
-            // InternalMenuDsl.g:9119:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
+            // InternalMenuDsl.g:9249:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
+            // InternalMenuDsl.g:9250:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
             {
-            pushFollow(FOLLOW_63);
+            pushFollow(FOLLOW_65);
             rule__XMemberFeatureCall__Group_1_1__3__Impl();
 
             state._fsp--;
@@ -31134,27 +31565,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3__Impl"
-    // InternalMenuDsl.g:9126:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
+    // InternalMenuDsl.g:9257: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 {
-            // InternalMenuDsl.g:9130:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
-            // InternalMenuDsl.g:9131:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalMenuDsl.g:9261:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
+            // InternalMenuDsl.g:9262:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
             {
-            // InternalMenuDsl.g:9131:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
-            // InternalMenuDsl.g:9132:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalMenuDsl.g:9262:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalMenuDsl.g:9263:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3()); 
             }
-            // InternalMenuDsl.g:9133:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
-            int alt85=2;
-            alt85 = dfa85.predict(input);
-            switch (alt85) {
+            // InternalMenuDsl.g:9264:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            int alt83=2;
+            alt83 = dfa83.predict(input);
+            switch (alt83) {
                 case 1 :
-                    // InternalMenuDsl.g:9133:3: rule__XMemberFeatureCall__Group_1_1_3__0
+                    // InternalMenuDsl.g:9264:3: rule__XMemberFeatureCall__Group_1_1_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3__0();
@@ -31192,14 +31623,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4"
-    // InternalMenuDsl.g:9141:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
+    // InternalMenuDsl.g:9272: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 {
-            // InternalMenuDsl.g:9145:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
-            // InternalMenuDsl.g:9146:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
+            // InternalMenuDsl.g:9276:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
+            // InternalMenuDsl.g:9277:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4__Impl();
@@ -31225,27 +31656,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4__Impl"
-    // InternalMenuDsl.g:9152:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
+    // InternalMenuDsl.g:9283: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 {
-            // InternalMenuDsl.g:9156:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
-            // InternalMenuDsl.g:9157:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalMenuDsl.g:9287:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
+            // InternalMenuDsl.g:9288:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
             {
-            // InternalMenuDsl.g:9157:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
-            // InternalMenuDsl.g:9158:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalMenuDsl.g:9288:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalMenuDsl.g:9289:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_4()); 
             }
-            // InternalMenuDsl.g:9159:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
-            int alt86=2;
-            alt86 = dfa86.predict(input);
-            switch (alt86) {
+            // InternalMenuDsl.g:9290:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            int alt84=2;
+            alt84 = dfa84.predict(input);
+            switch (alt84) {
                 case 1 :
-                    // InternalMenuDsl.g:9159:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+                    // InternalMenuDsl.g:9290:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
@@ -31283,14 +31714,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0"
-    // InternalMenuDsl.g:9168:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
+    // InternalMenuDsl.g:9299: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 {
-            // InternalMenuDsl.g:9172:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
-            // InternalMenuDsl.g:9173:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
+            // InternalMenuDsl.g:9303:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
+            // InternalMenuDsl.g:9304:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0__Impl();
@@ -31316,23 +31747,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0__Impl"
-    // InternalMenuDsl.g:9179:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:9310: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 {
-            // InternalMenuDsl.g:9183:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:9184:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalMenuDsl.g:9314:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:9315:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:9184:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
-            // InternalMenuDsl.g:9185:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalMenuDsl.g:9315:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalMenuDsl.g:9316:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0_0()); 
             }
-            // InternalMenuDsl.g:9186:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
-            // InternalMenuDsl.g:9186:3: rule__XMemberFeatureCall__Group_1_1_0_0__0
+            // InternalMenuDsl.g:9317:2: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalMenuDsl.g:9317:3: rule__XMemberFeatureCall__Group_1_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__0();
@@ -31367,16 +31798,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0"
-    // InternalMenuDsl.g:9195: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 ;
+    // InternalMenuDsl.g:9326: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 {
-            // InternalMenuDsl.g:9199:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
-            // InternalMenuDsl.g:9200:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
+            // InternalMenuDsl.g:9330:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
+            // InternalMenuDsl.g:9331:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_59);
+            pushFollow(FOLLOW_61);
             rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
@@ -31405,23 +31836,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl"
-    // InternalMenuDsl.g:9207:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:9338: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 {
-            // InternalMenuDsl.g:9211:1: ( ( () ) )
-            // InternalMenuDsl.g:9212:1: ( () )
+            // InternalMenuDsl.g:9342:1: ( ( () ) )
+            // InternalMenuDsl.g:9343:1: ( () )
             {
-            // InternalMenuDsl.g:9212:1: ( () )
-            // InternalMenuDsl.g:9213:2: ()
+            // InternalMenuDsl.g:9343:1: ( () )
+            // InternalMenuDsl.g:9344:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:9214:2: ()
-            // InternalMenuDsl.g:9214:3: 
+            // InternalMenuDsl.g:9345:2: ()
+            // InternalMenuDsl.g:9345:3: 
             {
             }
 
@@ -31446,14 +31877,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1"
-    // InternalMenuDsl.g:9222:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:9353: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 {
-            // InternalMenuDsl.g:9226:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
-            // InternalMenuDsl.g:9227:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
+            // InternalMenuDsl.g:9357:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
+            // InternalMenuDsl.g:9358:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl();
@@ -31479,23 +31910,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl"
-    // InternalMenuDsl.g:9233:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
+    // InternalMenuDsl.g:9364: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 {
-            // InternalMenuDsl.g:9237:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
-            // InternalMenuDsl.g:9238:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalMenuDsl.g:9368:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
+            // InternalMenuDsl.g:9369:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
             {
-            // InternalMenuDsl.g:9238:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
-            // InternalMenuDsl.g:9239:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalMenuDsl.g:9369:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalMenuDsl.g:9370:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:9240:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
-            // InternalMenuDsl.g:9240:3: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
+            // InternalMenuDsl.g:9371:2: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalMenuDsl.g:9371:3: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_1_0_0_1();
@@ -31530,16 +31961,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0"
-    // InternalMenuDsl.g:9249:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
+    // InternalMenuDsl.g:9380: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 {
-            // InternalMenuDsl.g:9253:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
-            // InternalMenuDsl.g:9254:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
+            // InternalMenuDsl.g:9384:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
+            // InternalMenuDsl.g:9385:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__XMemberFeatureCall__Group_1_1_1__0__Impl();
 
             state._fsp--;
@@ -31568,17 +31999,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0__Impl"
-    // InternalMenuDsl.g:9261:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:9392: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 {
-            // InternalMenuDsl.g:9265:1: ( ( '<' ) )
-            // InternalMenuDsl.g:9266:1: ( '<' )
+            // InternalMenuDsl.g:9396:1: ( ( '<' ) )
+            // InternalMenuDsl.g:9397:1: ( '<' )
             {
-            // InternalMenuDsl.g:9266:1: ( '<' )
-            // InternalMenuDsl.g:9267:2: '<'
+            // InternalMenuDsl.g:9397:1: ( '<' )
+            // InternalMenuDsl.g:9398:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
@@ -31609,16 +32040,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1"
-    // InternalMenuDsl.g:9276:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
+    // InternalMenuDsl.g:9407: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 {
-            // InternalMenuDsl.g:9280:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
-            // InternalMenuDsl.g:9281:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
+            // InternalMenuDsl.g:9411:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
+            // InternalMenuDsl.g:9412:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__XMemberFeatureCall__Group_1_1_1__1__Impl();
 
             state._fsp--;
@@ -31647,23 +32078,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1__Impl"
-    // InternalMenuDsl.g:9288:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
+    // InternalMenuDsl.g:9419: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 {
-            // InternalMenuDsl.g:9292:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
-            // InternalMenuDsl.g:9293:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalMenuDsl.g:9423:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
+            // InternalMenuDsl.g:9424:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
             {
-            // InternalMenuDsl.g:9293:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
-            // InternalMenuDsl.g:9294:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalMenuDsl.g:9424:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalMenuDsl.g:9425:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_1()); 
             }
-            // InternalMenuDsl.g:9295:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
-            // InternalMenuDsl.g:9295:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
+            // InternalMenuDsl.g:9426:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalMenuDsl.g:9426:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1();
@@ -31698,16 +32129,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2"
-    // InternalMenuDsl.g:9303:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
+    // InternalMenuDsl.g:9434: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 {
-            // InternalMenuDsl.g:9307:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
-            // InternalMenuDsl.g:9308:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
+            // InternalMenuDsl.g:9438:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
+            // InternalMenuDsl.g:9439:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__XMemberFeatureCall__Group_1_1_1__2__Impl();
 
             state._fsp--;
@@ -31736,37 +32167,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2__Impl"
-    // InternalMenuDsl.g:9315:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
+    // InternalMenuDsl.g:9446: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 {
-            // InternalMenuDsl.g:9319:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
-            // InternalMenuDsl.g:9320:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalMenuDsl.g:9450:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
+            // InternalMenuDsl.g:9451:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
             {
-            // InternalMenuDsl.g:9320:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
-            // InternalMenuDsl.g:9321:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalMenuDsl.g:9451:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalMenuDsl.g:9452:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1_2()); 
             }
-            // InternalMenuDsl.g:9322:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
-            loop87:
+            // InternalMenuDsl.g:9453:2: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            loop85:
             do {
-                int alt87=2;
-                int LA87_0 = input.LA(1);
+                int alt85=2;
+                int LA85_0 = input.LA(1);
 
-                if ( (LA87_0==63) ) {
-                    alt87=1;
+                if ( (LA85_0==65) ) {
+                    alt85=1;
                 }
 
 
-                switch (alt87) {
+                switch (alt85) {
             	case 1 :
-            	    // InternalMenuDsl.g:9322:3: rule__XMemberFeatureCall__Group_1_1_1_2__0
+            	    // InternalMenuDsl.g:9453:3: rule__XMemberFeatureCall__Group_1_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XMemberFeatureCall__Group_1_1_1_2__0();
 
             	    state._fsp--;
@@ -31776,7 +32207,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop87;
+            	    break loop85;
                 }
             } while (true);
 
@@ -31805,14 +32236,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3"
-    // InternalMenuDsl.g:9330:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
+    // InternalMenuDsl.g:9461: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 {
-            // InternalMenuDsl.g:9334:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
-            // InternalMenuDsl.g:9335:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
+            // InternalMenuDsl.g:9465:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
+            // InternalMenuDsl.g:9466:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3__Impl();
@@ -31838,17 +32269,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3__Impl"
-    // InternalMenuDsl.g:9341:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:9472: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 {
-            // InternalMenuDsl.g:9345:1: ( ( '>' ) )
-            // InternalMenuDsl.g:9346:1: ( '>' )
+            // InternalMenuDsl.g:9476:1: ( ( '>' ) )
+            // InternalMenuDsl.g:9477:1: ( '>' )
             {
-            // InternalMenuDsl.g:9346:1: ( '>' )
-            // InternalMenuDsl.g:9347:2: '>'
+            // InternalMenuDsl.g:9477:1: ( '>' )
+            // InternalMenuDsl.g:9478:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
@@ -31879,16 +32310,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0"
-    // InternalMenuDsl.g:9357: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 ;
+    // InternalMenuDsl.g:9488: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 {
-            // InternalMenuDsl.g:9361:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
-            // InternalMenuDsl.g:9362:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
+            // InternalMenuDsl.g:9492:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
+            // InternalMenuDsl.g:9493:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl();
 
             state._fsp--;
@@ -31917,22 +32348,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl"
-    // InternalMenuDsl.g:9369:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:9500: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 {
-            // InternalMenuDsl.g:9373:1: ( ( ',' ) )
-            // InternalMenuDsl.g:9374:1: ( ',' )
+            // InternalMenuDsl.g:9504:1: ( ( ',' ) )
+            // InternalMenuDsl.g:9505:1: ( ',' )
             {
-            // InternalMenuDsl.g:9374:1: ( ',' )
-            // InternalMenuDsl.g:9375:2: ','
+            // InternalMenuDsl.g:9505:1: ( ',' )
+            // InternalMenuDsl.g:9506:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
@@ -31958,14 +32389,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1"
-    // InternalMenuDsl.g:9384:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
+    // InternalMenuDsl.g:9515: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 {
-            // InternalMenuDsl.g:9388:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
-            // InternalMenuDsl.g:9389:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
+            // InternalMenuDsl.g:9519:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
+            // InternalMenuDsl.g:9520:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl();
@@ -31991,23 +32422,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl"
-    // InternalMenuDsl.g:9395:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
+    // InternalMenuDsl.g:9526: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 {
-            // InternalMenuDsl.g:9399:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
-            // InternalMenuDsl.g:9400:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalMenuDsl.g:9530:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
+            // InternalMenuDsl.g:9531:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
             {
-            // InternalMenuDsl.g:9400:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
-            // InternalMenuDsl.g:9401:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalMenuDsl.g:9531:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalMenuDsl.g:9532:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_2_1()); 
             }
-            // InternalMenuDsl.g:9402:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
-            // InternalMenuDsl.g:9402:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
+            // InternalMenuDsl.g:9533:2: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalMenuDsl.g:9533:3: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1();
@@ -32042,16 +32473,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0"
-    // InternalMenuDsl.g:9411:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
+    // InternalMenuDsl.g:9542: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 {
-            // InternalMenuDsl.g:9415:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
-            // InternalMenuDsl.g:9416:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
+            // InternalMenuDsl.g:9546:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
+            // InternalMenuDsl.g:9547:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_68);
             rule__XMemberFeatureCall__Group_1_1_3__0__Impl();
 
             state._fsp--;
@@ -32080,23 +32511,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0__Impl"
-    // InternalMenuDsl.g:9423:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
+    // InternalMenuDsl.g:9554: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 {
-            // InternalMenuDsl.g:9427:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
-            // InternalMenuDsl.g:9428:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalMenuDsl.g:9558:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
+            // InternalMenuDsl.g:9559:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
             {
-            // InternalMenuDsl.g:9428:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
-            // InternalMenuDsl.g:9429:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalMenuDsl.g:9559:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalMenuDsl.g:9560:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallAssignment_1_1_3_0()); 
             }
-            // InternalMenuDsl.g:9430:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
-            // InternalMenuDsl.g:9430:3: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
+            // InternalMenuDsl.g:9561:2: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalMenuDsl.g:9561:3: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0();
@@ -32131,16 +32562,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1"
-    // InternalMenuDsl.g:9438:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
+    // InternalMenuDsl.g:9569: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 {
-            // InternalMenuDsl.g:9442:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
-            // InternalMenuDsl.g:9443:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
+            // InternalMenuDsl.g:9573:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
+            // InternalMenuDsl.g:9574:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_68);
             rule__XMemberFeatureCall__Group_1_1_3__1__Impl();
 
             state._fsp--;
@@ -32169,31 +32600,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1__Impl"
-    // InternalMenuDsl.g:9450:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
+    // InternalMenuDsl.g:9581: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 {
-            // InternalMenuDsl.g:9454:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
-            // InternalMenuDsl.g:9455:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalMenuDsl.g:9585:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
+            // InternalMenuDsl.g:9586:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
             {
-            // InternalMenuDsl.g:9455:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
-            // InternalMenuDsl.g:9456:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalMenuDsl.g:9586:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalMenuDsl.g:9587:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_3_1()); 
             }
-            // InternalMenuDsl.g:9457:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
-            int alt88=2;
-            int LA88_0 = input.LA(1);
+            // InternalMenuDsl.g:9588:2: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            int alt86=2;
+            int LA86_0 = input.LA(1);
 
-            if ( ((LA88_0>=RULE_STRING && LA88_0<=RULE_DECIMAL)||LA88_0==27||LA88_0==31||(LA88_0>=34 && LA88_0<=35)||LA88_0==40||(LA88_0>=45 && LA88_0<=50)||LA88_0==52||LA88_0==61||(LA88_0>=65 && LA88_0<=66)||LA88_0==69||LA88_0==71||(LA88_0>=75 && LA88_0<=83)||LA88_0==85||LA88_0==103||LA88_0==105) ) {
-                alt88=1;
+            if ( ((LA86_0>=RULE_STRING && LA86_0<=RULE_DECIMAL)||LA86_0==27||LA86_0==31||(LA86_0>=34 && LA86_0<=35)||LA86_0==40||(LA86_0>=45 && LA86_0<=50)||LA86_0==57||LA86_0==63||(LA86_0>=67 && LA86_0<=68)||LA86_0==71||LA86_0==73||(LA86_0>=77 && LA86_0<=85)||LA86_0==87||LA86_0==105||LA86_0==107) ) {
+                alt86=1;
             }
-            switch (alt88) {
+            switch (alt86) {
                 case 1 :
-                    // InternalMenuDsl.g:9457:3: rule__XMemberFeatureCall__Alternatives_1_1_3_1
+                    // InternalMenuDsl.g:9588:3: rule__XMemberFeatureCall__Alternatives_1_1_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Alternatives_1_1_3_1();
@@ -32231,14 +32662,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2"
-    // InternalMenuDsl.g:9465:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
+    // InternalMenuDsl.g:9596: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 {
-            // InternalMenuDsl.g:9469:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
-            // InternalMenuDsl.g:9470:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
+            // InternalMenuDsl.g:9600:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
+            // InternalMenuDsl.g:9601:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2__Impl();
@@ -32264,22 +32695,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2__Impl"
-    // InternalMenuDsl.g:9476:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:9607: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 {
-            // InternalMenuDsl.g:9480:1: ( ( ')' ) )
-            // InternalMenuDsl.g:9481:1: ( ')' )
+            // InternalMenuDsl.g:9611:1: ( ( ')' ) )
+            // InternalMenuDsl.g:9612:1: ( ')' )
             {
-            // InternalMenuDsl.g:9481:1: ( ')' )
-            // InternalMenuDsl.g:9482:2: ')'
+            // InternalMenuDsl.g:9612:1: ( ')' )
+            // InternalMenuDsl.g:9613:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
@@ -32305,16 +32736,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0"
-    // InternalMenuDsl.g:9492: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 ;
+    // InternalMenuDsl.g:9623: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 {
-            // InternalMenuDsl.g:9496:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
-            // InternalMenuDsl.g:9497:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
+            // InternalMenuDsl.g:9627:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
+            // InternalMenuDsl.g:9628:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl();
 
             state._fsp--;
@@ -32343,23 +32774,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl"
-    // InternalMenuDsl.g:9504:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
+    // InternalMenuDsl.g:9635: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 {
-            // InternalMenuDsl.g:9508:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
-            // InternalMenuDsl.g:9509:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalMenuDsl.g:9639:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
+            // InternalMenuDsl.g:9640:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
             {
-            // InternalMenuDsl.g:9509:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
-            // InternalMenuDsl.g:9510:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalMenuDsl.g:9640:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalMenuDsl.g:9641:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_0()); 
             }
-            // InternalMenuDsl.g:9511:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
-            // InternalMenuDsl.g:9511:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
+            // InternalMenuDsl.g:9642:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalMenuDsl.g:9642:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0();
@@ -32394,14 +32825,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1"
-    // InternalMenuDsl.g:9519:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
+    // InternalMenuDsl.g:9650: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 {
-            // InternalMenuDsl.g:9523:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
-            // InternalMenuDsl.g:9524:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
+            // InternalMenuDsl.g:9654:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
+            // InternalMenuDsl.g:9655:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl();
@@ -32427,37 +32858,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl"
-    // InternalMenuDsl.g:9530:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
+    // InternalMenuDsl.g:9661: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 {
-            // InternalMenuDsl.g:9534:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
-            // InternalMenuDsl.g:9535:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalMenuDsl.g:9665:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
+            // InternalMenuDsl.g:9666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
             {
-            // InternalMenuDsl.g:9535:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
-            // InternalMenuDsl.g:9536:2: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalMenuDsl.g:9666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalMenuDsl.g:9667: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()); 
             }
-            // InternalMenuDsl.g:9537:2: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
-            loop89:
+            // InternalMenuDsl.g:9668:2: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            loop87:
             do {
-                int alt89=2;
-                int LA89_0 = input.LA(1);
+                int alt87=2;
+                int LA87_0 = input.LA(1);
 
-                if ( (LA89_0==63) ) {
-                    alt89=1;
+                if ( (LA87_0==65) ) {
+                    alt87=1;
                 }
 
 
-                switch (alt89) {
+                switch (alt87) {
             	case 1 :
-            	    // InternalMenuDsl.g:9537:3: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
+            	    // InternalMenuDsl.g:9668:3: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0();
 
             	    state._fsp--;
@@ -32467,7 +32898,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop89;
+            	    break loop87;
                 }
             } while (true);
 
@@ -32496,16 +32927,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0"
-    // InternalMenuDsl.g:9546: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 ;
+    // InternalMenuDsl.g:9677: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 {
-            // InternalMenuDsl.g:9550:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
-            // InternalMenuDsl.g:9551:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
+            // InternalMenuDsl.g:9681:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
+            // InternalMenuDsl.g:9682:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl();
 
             state._fsp--;
@@ -32534,22 +32965,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl"
-    // InternalMenuDsl.g:9558:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:9689: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 {
-            // InternalMenuDsl.g:9562:1: ( ( ',' ) )
-            // InternalMenuDsl.g:9563:1: ( ',' )
+            // InternalMenuDsl.g:9693:1: ( ( ',' ) )
+            // InternalMenuDsl.g:9694:1: ( ',' )
             {
-            // InternalMenuDsl.g:9563:1: ( ',' )
-            // InternalMenuDsl.g:9564:2: ','
+            // InternalMenuDsl.g:9694:1: ( ',' )
+            // InternalMenuDsl.g:9695:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
@@ -32575,14 +33006,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1"
-    // InternalMenuDsl.g:9573:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
+    // InternalMenuDsl.g:9704: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 {
-            // InternalMenuDsl.g:9577:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
-            // InternalMenuDsl.g:9578:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
+            // InternalMenuDsl.g:9708:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
+            // InternalMenuDsl.g:9709: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();
@@ -32608,23 +33039,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl"
-    // InternalMenuDsl.g:9584:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
+    // InternalMenuDsl.g:9715: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 {
-            // InternalMenuDsl.g:9588:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
-            // InternalMenuDsl.g:9589:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalMenuDsl.g:9719:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
+            // InternalMenuDsl.g:9720:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
             {
-            // InternalMenuDsl.g:9589:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
-            // InternalMenuDsl.g:9590:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalMenuDsl.g:9720:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalMenuDsl.g:9721: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()); 
             }
-            // InternalMenuDsl.g:9591:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
-            // InternalMenuDsl.g:9591:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
+            // InternalMenuDsl.g:9722:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalMenuDsl.g:9722:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1();
@@ -32659,16 +33090,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0"
-    // InternalMenuDsl.g:9600:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
+    // InternalMenuDsl.g:9731: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 {
-            // InternalMenuDsl.g:9604:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
-            // InternalMenuDsl.g:9605:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
+            // InternalMenuDsl.g:9735:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
+            // InternalMenuDsl.g:9736:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_32);
             rule__XSetLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -32697,23 +33128,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0__Impl"
-    // InternalMenuDsl.g:9612:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:9743:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9616:1: ( ( () ) )
-            // InternalMenuDsl.g:9617:1: ( () )
+            // InternalMenuDsl.g:9747:1: ( ( () ) )
+            // InternalMenuDsl.g:9748:1: ( () )
             {
-            // InternalMenuDsl.g:9617:1: ( () )
-            // InternalMenuDsl.g:9618:2: ()
+            // InternalMenuDsl.g:9748:1: ( () )
+            // InternalMenuDsl.g:9749:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getXSetLiteralAction_0()); 
             }
-            // InternalMenuDsl.g:9619:2: ()
-            // InternalMenuDsl.g:9619:3: 
+            // InternalMenuDsl.g:9750:2: ()
+            // InternalMenuDsl.g:9750:3: 
             {
             }
 
@@ -32738,16 +33169,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1"
-    // InternalMenuDsl.g:9627:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
+    // InternalMenuDsl.g:9758: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 {
-            // InternalMenuDsl.g:9631:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
-            // InternalMenuDsl.g:9632:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
+            // InternalMenuDsl.g:9762:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
+            // InternalMenuDsl.g:9763:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
             {
-            pushFollow(FOLLOW_8);
+            pushFollow(FOLLOW_69);
             rule__XSetLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -32776,22 +33207,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1__Impl"
-    // InternalMenuDsl.g:9639:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalMenuDsl.g:9770:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9643:1: ( ( '#' ) )
-            // InternalMenuDsl.g:9644:1: ( '#' )
+            // InternalMenuDsl.g:9774:1: ( ( '#' ) )
+            // InternalMenuDsl.g:9775:1: ( '#' )
             {
-            // InternalMenuDsl.g:9644:1: ( '#' )
-            // InternalMenuDsl.g:9645:2: '#'
+            // InternalMenuDsl.g:9775:1: ( '#' )
+            // InternalMenuDsl.g:9776:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,65,FOLLOW_2); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -32817,16 +33248,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2"
-    // InternalMenuDsl.g:9654:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
+    // InternalMenuDsl.g:9785: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 {
-            // InternalMenuDsl.g:9658:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
-            // InternalMenuDsl.g:9659:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
+            // InternalMenuDsl.g:9789:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
+            // InternalMenuDsl.g:9790:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
             {
-            pushFollow(FOLLOW_67);
+            pushFollow(FOLLOW_70);
             rule__XSetLiteral__Group__2__Impl();
 
             state._fsp--;
@@ -32855,22 +33286,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2__Impl"
-    // InternalMenuDsl.g:9666:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
+    // InternalMenuDsl.g:9797:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
     public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9670:1: ( ( '{' ) )
-            // InternalMenuDsl.g:9671:1: ( '{' )
+            // InternalMenuDsl.g:9801:1: ( ( '{' ) )
+            // InternalMenuDsl.g:9802:1: ( '{' )
             {
-            // InternalMenuDsl.g:9671:1: ( '{' )
-            // InternalMenuDsl.g:9672:2: '{'
+            // InternalMenuDsl.g:9802:1: ( '{' )
+            // InternalMenuDsl.g:9803:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,52,FOLLOW_2); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -32896,16 +33327,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3"
-    // InternalMenuDsl.g:9681:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
+    // InternalMenuDsl.g:9812: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 {
-            // InternalMenuDsl.g:9685:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
-            // InternalMenuDsl.g:9686:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
+            // InternalMenuDsl.g:9816:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
+            // InternalMenuDsl.g:9817:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
             {
-            pushFollow(FOLLOW_67);
+            pushFollow(FOLLOW_70);
             rule__XSetLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -32934,31 +33365,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3__Impl"
-    // InternalMenuDsl.g:9693:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:9824: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 {
-            // InternalMenuDsl.g:9697:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
-            // InternalMenuDsl.g:9698:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalMenuDsl.g:9828:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
+            // InternalMenuDsl.g:9829:1: ( ( rule__XSetLiteral__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:9698:1: ( ( rule__XSetLiteral__Group_3__0 )? )
-            // InternalMenuDsl.g:9699:2: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalMenuDsl.g:9829:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalMenuDsl.g:9830:2: ( rule__XSetLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:9700:2: ( rule__XSetLiteral__Group_3__0 )?
-            int alt90=2;
-            int LA90_0 = input.LA(1);
+            // InternalMenuDsl.g:9831:2: ( rule__XSetLiteral__Group_3__0 )?
+            int alt88=2;
+            int LA88_0 = input.LA(1);
 
-            if ( ((LA90_0>=RULE_STRING && LA90_0<=RULE_DECIMAL)||LA90_0==27||(LA90_0>=34 && LA90_0<=35)||LA90_0==40||(LA90_0>=45 && LA90_0<=50)||LA90_0==52||LA90_0==61||(LA90_0>=65 && LA90_0<=66)||LA90_0==69||LA90_0==71||(LA90_0>=75 && LA90_0<=83)||LA90_0==85||LA90_0==105) ) {
-                alt90=1;
+            if ( ((LA88_0>=RULE_STRING && LA88_0<=RULE_DECIMAL)||LA88_0==27||(LA88_0>=34 && LA88_0<=35)||LA88_0==40||(LA88_0>=45 && LA88_0<=50)||LA88_0==57||LA88_0==63||(LA88_0>=67 && LA88_0<=68)||LA88_0==71||LA88_0==73||(LA88_0>=77 && LA88_0<=85)||LA88_0==87||LA88_0==107) ) {
+                alt88=1;
             }
-            switch (alt90) {
+            switch (alt88) {
                 case 1 :
-                    // InternalMenuDsl.g:9700:3: rule__XSetLiteral__Group_3__0
+                    // InternalMenuDsl.g:9831:3: rule__XSetLiteral__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSetLiteral__Group_3__0();
@@ -32996,14 +33427,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4"
-    // InternalMenuDsl.g:9708:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
+    // InternalMenuDsl.g:9839:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
     public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9712:1: ( rule__XSetLiteral__Group__4__Impl )
-            // InternalMenuDsl.g:9713:2: rule__XSetLiteral__Group__4__Impl
+            // InternalMenuDsl.g:9843:1: ( rule__XSetLiteral__Group__4__Impl )
+            // InternalMenuDsl.g:9844:2: rule__XSetLiteral__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4__Impl();
@@ -33029,22 +33460,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4__Impl"
-    // InternalMenuDsl.g:9719:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
+    // InternalMenuDsl.g:9850:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
     public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9723:1: ( ( '}' ) )
-            // InternalMenuDsl.g:9724:1: ( '}' )
+            // InternalMenuDsl.g:9854:1: ( ( '}' ) )
+            // InternalMenuDsl.g:9855:1: ( '}' )
             {
-            // InternalMenuDsl.g:9724:1: ( '}' )
-            // InternalMenuDsl.g:9725:2: '}'
+            // InternalMenuDsl.g:9855:1: ( '}' )
+            // InternalMenuDsl.g:9856:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,55,FOLLOW_2); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -33070,16 +33501,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0"
-    // InternalMenuDsl.g:9735:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
+    // InternalMenuDsl.g:9866: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 {
-            // InternalMenuDsl.g:9739:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
-            // InternalMenuDsl.g:9740:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
+            // InternalMenuDsl.g:9870:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
+            // InternalMenuDsl.g:9871:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XSetLiteral__Group_3__0__Impl();
 
             state._fsp--;
@@ -33108,23 +33539,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0__Impl"
-    // InternalMenuDsl.g:9747:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalMenuDsl.g:9878: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 {
-            // InternalMenuDsl.g:9751:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
-            // InternalMenuDsl.g:9752:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalMenuDsl.g:9882:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalMenuDsl.g:9883:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
             {
-            // InternalMenuDsl.g:9752:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
-            // InternalMenuDsl.g:9753:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalMenuDsl.g:9883:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalMenuDsl.g:9884:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // InternalMenuDsl.g:9754:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
-            // InternalMenuDsl.g:9754:3: rule__XSetLiteral__ElementsAssignment_3_0
+            // InternalMenuDsl.g:9885:2: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalMenuDsl.g:9885:3: rule__XSetLiteral__ElementsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_0();
@@ -33159,14 +33590,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1"
-    // InternalMenuDsl.g:9762:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
+    // InternalMenuDsl.g:9893: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 {
-            // InternalMenuDsl.g:9766:1: ( rule__XSetLiteral__Group_3__1__Impl )
-            // InternalMenuDsl.g:9767:2: rule__XSetLiteral__Group_3__1__Impl
+            // InternalMenuDsl.g:9897:1: ( rule__XSetLiteral__Group_3__1__Impl )
+            // InternalMenuDsl.g:9898:2: rule__XSetLiteral__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1__Impl();
@@ -33192,37 +33623,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1__Impl"
-    // InternalMenuDsl.g:9773:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
+    // InternalMenuDsl.g:9904: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 {
-            // InternalMenuDsl.g:9777:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
-            // InternalMenuDsl.g:9778:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalMenuDsl.g:9908:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
+            // InternalMenuDsl.g:9909:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
             {
-            // InternalMenuDsl.g:9778:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
-            // InternalMenuDsl.g:9779:2: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalMenuDsl.g:9909:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalMenuDsl.g:9910:2: ( rule__XSetLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3_1()); 
             }
-            // InternalMenuDsl.g:9780:2: ( rule__XSetLiteral__Group_3_1__0 )*
-            loop91:
+            // InternalMenuDsl.g:9911:2: ( rule__XSetLiteral__Group_3_1__0 )*
+            loop89:
             do {
-                int alt91=2;
-                int LA91_0 = input.LA(1);
+                int alt89=2;
+                int LA89_0 = input.LA(1);
 
-                if ( (LA91_0==63) ) {
-                    alt91=1;
+                if ( (LA89_0==65) ) {
+                    alt89=1;
                 }
 
 
-                switch (alt91) {
+                switch (alt89) {
             	case 1 :
-            	    // InternalMenuDsl.g:9780:3: rule__XSetLiteral__Group_3_1__0
+            	    // InternalMenuDsl.g:9911:3: rule__XSetLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XSetLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -33232,7 +33663,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop91;
+            	    break loop89;
                 }
             } while (true);
 
@@ -33261,16 +33692,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0"
-    // InternalMenuDsl.g:9789:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
+    // InternalMenuDsl.g:9920: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 {
-            // InternalMenuDsl.g:9793:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
-            // InternalMenuDsl.g:9794:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
+            // InternalMenuDsl.g:9924:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
+            // InternalMenuDsl.g:9925:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XSetLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -33299,22 +33730,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0__Impl"
-    // InternalMenuDsl.g:9801:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:9932:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9805:1: ( ( ',' ) )
-            // InternalMenuDsl.g:9806:1: ( ',' )
+            // InternalMenuDsl.g:9936:1: ( ( ',' ) )
+            // InternalMenuDsl.g:9937:1: ( ',' )
             {
-            // InternalMenuDsl.g:9806:1: ( ',' )
-            // InternalMenuDsl.g:9807:2: ','
+            // InternalMenuDsl.g:9937:1: ( ',' )
+            // InternalMenuDsl.g:9938:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -33340,14 +33771,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1"
-    // InternalMenuDsl.g:9816:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
+    // InternalMenuDsl.g:9947: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 {
-            // InternalMenuDsl.g:9820:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
-            // InternalMenuDsl.g:9821:2: rule__XSetLiteral__Group_3_1__1__Impl
+            // InternalMenuDsl.g:9951:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
+            // InternalMenuDsl.g:9952:2: rule__XSetLiteral__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1__Impl();
@@ -33373,23 +33804,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1__Impl"
-    // InternalMenuDsl.g:9827:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalMenuDsl.g:9958: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 {
-            // InternalMenuDsl.g:9831:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
-            // InternalMenuDsl.g:9832:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:9962:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalMenuDsl.g:9963:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // InternalMenuDsl.g:9832:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
-            // InternalMenuDsl.g:9833:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalMenuDsl.g:9963:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:9964:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // InternalMenuDsl.g:9834:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
-            // InternalMenuDsl.g:9834:3: rule__XSetLiteral__ElementsAssignment_3_1_1
+            // InternalMenuDsl.g:9965:2: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalMenuDsl.g:9965:3: rule__XSetLiteral__ElementsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_1_1();
@@ -33424,16 +33855,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__0"
-    // InternalMenuDsl.g:9843:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
+    // InternalMenuDsl.g:9974: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 {
-            // InternalMenuDsl.g:9847:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
-            // InternalMenuDsl.g:9848:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
+            // InternalMenuDsl.g:9978:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
+            // InternalMenuDsl.g:9979:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_32);
             rule__XListLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -33462,23 +33893,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__0__Impl"
-    // InternalMenuDsl.g:9855:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:9986:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9859:1: ( ( () ) )
-            // InternalMenuDsl.g:9860:1: ( () )
+            // InternalMenuDsl.g:9990:1: ( ( () ) )
+            // InternalMenuDsl.g:9991:1: ( () )
             {
-            // InternalMenuDsl.g:9860:1: ( () )
-            // InternalMenuDsl.g:9861:2: ()
+            // InternalMenuDsl.g:9991:1: ( () )
+            // InternalMenuDsl.g:9992:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // InternalMenuDsl.g:9862:2: ()
-            // InternalMenuDsl.g:9862:3: 
+            // InternalMenuDsl.g:9993:2: ()
+            // InternalMenuDsl.g:9993:3: 
             {
             }
 
@@ -33503,16 +33934,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__1"
-    // InternalMenuDsl.g:9870:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
+    // InternalMenuDsl.g:10001: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 {
-            // InternalMenuDsl.g:9874:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
-            // InternalMenuDsl.g:9875:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
+            // InternalMenuDsl.g:10005:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
+            // InternalMenuDsl.g:10006:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__XListLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -33541,22 +33972,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__1__Impl"
-    // InternalMenuDsl.g:9882:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalMenuDsl.g:10013:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9886:1: ( ( '#' ) )
-            // InternalMenuDsl.g:9887:1: ( '#' )
+            // InternalMenuDsl.g:10017:1: ( ( '#' ) )
+            // InternalMenuDsl.g:10018:1: ( '#' )
             {
-            // InternalMenuDsl.g:9887:1: ( '#' )
-            // InternalMenuDsl.g:9888:2: '#'
+            // InternalMenuDsl.g:10018:1: ( '#' )
+            // InternalMenuDsl.g:10019:2: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,65,FOLLOW_2); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -33582,16 +34013,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__2"
-    // InternalMenuDsl.g:9897:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
+    // InternalMenuDsl.g:10028: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 {
-            // InternalMenuDsl.g:9901:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
-            // InternalMenuDsl.g:9902:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
+            // InternalMenuDsl.g:10032:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
+            // InternalMenuDsl.g:10033:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__XListLiteral__Group__2__Impl();
 
             state._fsp--;
@@ -33620,22 +34051,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__2__Impl"
-    // InternalMenuDsl.g:9909:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
+    // InternalMenuDsl.g:10040:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9913:1: ( ( '[' ) )
-            // InternalMenuDsl.g:9914:1: ( '[' )
+            // InternalMenuDsl.g:10044:1: ( ( '[' ) )
+            // InternalMenuDsl.g:10045:1: ( '[' )
             {
-            // InternalMenuDsl.g:9914:1: ( '[' )
-            // InternalMenuDsl.g:9915:2: '['
+            // InternalMenuDsl.g:10045:1: ( '[' )
+            // InternalMenuDsl.g:10046:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,66,FOLLOW_2); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -33661,16 +34092,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__3"
-    // InternalMenuDsl.g:9924:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
+    // InternalMenuDsl.g:10055: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 {
-            // InternalMenuDsl.g:9928:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
-            // InternalMenuDsl.g:9929:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
+            // InternalMenuDsl.g:10059:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
+            // InternalMenuDsl.g:10060:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__XListLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -33699,31 +34130,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__3__Impl"
-    // InternalMenuDsl.g:9936:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:10067: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 {
-            // InternalMenuDsl.g:9940:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
-            // InternalMenuDsl.g:9941:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalMenuDsl.g:10071:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
+            // InternalMenuDsl.g:10072:1: ( ( rule__XListLiteral__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:9941:1: ( ( rule__XListLiteral__Group_3__0 )? )
-            // InternalMenuDsl.g:9942:2: ( rule__XListLiteral__Group_3__0 )?
+            // InternalMenuDsl.g:10072:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalMenuDsl.g:10073:2: ( rule__XListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:9943:2: ( rule__XListLiteral__Group_3__0 )?
-            int alt92=2;
-            int LA92_0 = input.LA(1);
+            // InternalMenuDsl.g:10074:2: ( rule__XListLiteral__Group_3__0 )?
+            int alt90=2;
+            int LA90_0 = input.LA(1);
 
-            if ( ((LA92_0>=RULE_STRING && LA92_0<=RULE_DECIMAL)||LA92_0==27||(LA92_0>=34 && LA92_0<=35)||LA92_0==40||(LA92_0>=45 && LA92_0<=50)||LA92_0==52||LA92_0==61||(LA92_0>=65 && LA92_0<=66)||LA92_0==69||LA92_0==71||(LA92_0>=75 && LA92_0<=83)||LA92_0==85||LA92_0==105) ) {
-                alt92=1;
+            if ( ((LA90_0>=RULE_STRING && LA90_0<=RULE_DECIMAL)||LA90_0==27||(LA90_0>=34 && LA90_0<=35)||LA90_0==40||(LA90_0>=45 && LA90_0<=50)||LA90_0==57||LA90_0==63||(LA90_0>=67 && LA90_0<=68)||LA90_0==71||LA90_0==73||(LA90_0>=77 && LA90_0<=85)||LA90_0==87||LA90_0==107) ) {
+                alt90=1;
             }
-            switch (alt92) {
+            switch (alt90) {
                 case 1 :
-                    // InternalMenuDsl.g:9943:3: rule__XListLiteral__Group_3__0
+                    // InternalMenuDsl.g:10074:3: rule__XListLiteral__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XListLiteral__Group_3__0();
@@ -33761,14 +34192,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__4"
-    // InternalMenuDsl.g:9951:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
+    // InternalMenuDsl.g:10082:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
     public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9955:1: ( rule__XListLiteral__Group__4__Impl )
-            // InternalMenuDsl.g:9956:2: rule__XListLiteral__Group__4__Impl
+            // InternalMenuDsl.g:10086:1: ( rule__XListLiteral__Group__4__Impl )
+            // InternalMenuDsl.g:10087:2: rule__XListLiteral__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4__Impl();
@@ -33794,22 +34225,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group__4__Impl"
-    // InternalMenuDsl.g:9962:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
+    // InternalMenuDsl.g:10093:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:9966:1: ( ( ']' ) )
-            // InternalMenuDsl.g:9967:1: ( ']' )
+            // InternalMenuDsl.g:10097:1: ( ( ']' ) )
+            // InternalMenuDsl.g:10098:1: ( ']' )
             {
-            // InternalMenuDsl.g:9967:1: ( ']' )
-            // InternalMenuDsl.g:9968:2: ']'
+            // InternalMenuDsl.g:10098:1: ( ']' )
+            // InternalMenuDsl.g:10099:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,64,FOLLOW_2); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -33835,16 +34266,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0"
-    // InternalMenuDsl.g:9978:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
+    // InternalMenuDsl.g:10109: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 {
-            // InternalMenuDsl.g:9982:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
-            // InternalMenuDsl.g:9983:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
+            // InternalMenuDsl.g:10113:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
+            // InternalMenuDsl.g:10114:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XListLiteral__Group_3__0__Impl();
 
             state._fsp--;
@@ -33873,23 +34304,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0__Impl"
-    // InternalMenuDsl.g:9990:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalMenuDsl.g:10121: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 {
-            // InternalMenuDsl.g:9994:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
-            // InternalMenuDsl.g:9995:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalMenuDsl.g:10125:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalMenuDsl.g:10126:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
             {
-            // InternalMenuDsl.g:9995:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
-            // InternalMenuDsl.g:9996:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalMenuDsl.g:10126:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalMenuDsl.g:10127:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // InternalMenuDsl.g:9997:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
-            // InternalMenuDsl.g:9997:3: rule__XListLiteral__ElementsAssignment_3_0
+            // InternalMenuDsl.g:10128:2: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalMenuDsl.g:10128:3: rule__XListLiteral__ElementsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_0();
@@ -33924,14 +34355,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1"
-    // InternalMenuDsl.g:10005:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
+    // InternalMenuDsl.g:10136: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 {
-            // InternalMenuDsl.g:10009:1: ( rule__XListLiteral__Group_3__1__Impl )
-            // InternalMenuDsl.g:10010:2: rule__XListLiteral__Group_3__1__Impl
+            // InternalMenuDsl.g:10140:1: ( rule__XListLiteral__Group_3__1__Impl )
+            // InternalMenuDsl.g:10141:2: rule__XListLiteral__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1__Impl();
@@ -33957,37 +34388,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1__Impl"
-    // InternalMenuDsl.g:10016:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
+    // InternalMenuDsl.g:10147: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 {
-            // InternalMenuDsl.g:10020:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
-            // InternalMenuDsl.g:10021:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalMenuDsl.g:10151:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
+            // InternalMenuDsl.g:10152:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
             {
-            // InternalMenuDsl.g:10021:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
-            // InternalMenuDsl.g:10022:2: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalMenuDsl.g:10152:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalMenuDsl.g:10153:2: ( rule__XListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3_1()); 
             }
-            // InternalMenuDsl.g:10023:2: ( rule__XListLiteral__Group_3_1__0 )*
-            loop93:
+            // InternalMenuDsl.g:10154:2: ( rule__XListLiteral__Group_3_1__0 )*
+            loop91:
             do {
-                int alt93=2;
-                int LA93_0 = input.LA(1);
+                int alt91=2;
+                int LA91_0 = input.LA(1);
 
-                if ( (LA93_0==63) ) {
-                    alt93=1;
+                if ( (LA91_0==65) ) {
+                    alt91=1;
                 }
 
 
-                switch (alt93) {
+                switch (alt91) {
             	case 1 :
-            	    // InternalMenuDsl.g:10023:3: rule__XListLiteral__Group_3_1__0
+            	    // InternalMenuDsl.g:10154:3: rule__XListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -33997,7 +34428,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop93;
+            	    break loop91;
                 }
             } while (true);
 
@@ -34026,16 +34457,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0"
-    // InternalMenuDsl.g:10032:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
+    // InternalMenuDsl.g:10163: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 {
-            // InternalMenuDsl.g:10036:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
-            // InternalMenuDsl.g:10037:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
+            // InternalMenuDsl.g:10167:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
+            // InternalMenuDsl.g:10168:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -34064,22 +34495,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0__Impl"
-    // InternalMenuDsl.g:10044:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:10175:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10048:1: ( ( ',' ) )
-            // InternalMenuDsl.g:10049:1: ( ',' )
+            // InternalMenuDsl.g:10179:1: ( ( ',' ) )
+            // InternalMenuDsl.g:10180:1: ( ',' )
             {
-            // InternalMenuDsl.g:10049:1: ( ',' )
-            // InternalMenuDsl.g:10050:2: ','
+            // InternalMenuDsl.g:10180:1: ( ',' )
+            // InternalMenuDsl.g:10181:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -34105,14 +34536,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1"
-    // InternalMenuDsl.g:10059:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
+    // InternalMenuDsl.g:10190: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 {
-            // InternalMenuDsl.g:10063:1: ( rule__XListLiteral__Group_3_1__1__Impl )
-            // InternalMenuDsl.g:10064:2: rule__XListLiteral__Group_3_1__1__Impl
+            // InternalMenuDsl.g:10194:1: ( rule__XListLiteral__Group_3_1__1__Impl )
+            // InternalMenuDsl.g:10195:2: rule__XListLiteral__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1__Impl();
@@ -34138,23 +34569,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1__Impl"
-    // InternalMenuDsl.g:10070:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalMenuDsl.g:10201: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 {
-            // InternalMenuDsl.g:10074:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // InternalMenuDsl.g:10075:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:10205:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalMenuDsl.g:10206:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // InternalMenuDsl.g:10075:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
-            // InternalMenuDsl.g:10076:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalMenuDsl.g:10206:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:10207:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // InternalMenuDsl.g:10077:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
-            // InternalMenuDsl.g:10077:3: rule__XListLiteral__ElementsAssignment_3_1_1
+            // InternalMenuDsl.g:10208:2: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalMenuDsl.g:10208:3: rule__XListLiteral__ElementsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_1_1();
@@ -34189,16 +34620,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__0"
-    // InternalMenuDsl.g:10086:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
+    // InternalMenuDsl.g:10217: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 {
-            // InternalMenuDsl.g:10090:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
-            // InternalMenuDsl.g:10091:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
+            // InternalMenuDsl.g:10221:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
+            // InternalMenuDsl.g:10222:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_71);
             rule__XClosure__Group__0__Impl();
 
             state._fsp--;
@@ -34227,23 +34658,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__0__Impl"
-    // InternalMenuDsl.g:10098:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
+    // InternalMenuDsl.g:10229: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 {
-            // InternalMenuDsl.g:10102:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
-            // InternalMenuDsl.g:10103:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalMenuDsl.g:10233:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
+            // InternalMenuDsl.g:10234:1: ( ( rule__XClosure__Group_0__0 ) )
             {
-            // InternalMenuDsl.g:10103:1: ( ( rule__XClosure__Group_0__0 ) )
-            // InternalMenuDsl.g:10104:2: ( rule__XClosure__Group_0__0 )
+            // InternalMenuDsl.g:10234:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalMenuDsl.g:10235:2: ( rule__XClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0()); 
             }
-            // InternalMenuDsl.g:10105:2: ( rule__XClosure__Group_0__0 )
-            // InternalMenuDsl.g:10105:3: rule__XClosure__Group_0__0
+            // InternalMenuDsl.g:10236:2: ( rule__XClosure__Group_0__0 )
+            // InternalMenuDsl.g:10236:3: rule__XClosure__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0();
@@ -34278,16 +34709,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__1"
-    // InternalMenuDsl.g:10113:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
+    // InternalMenuDsl.g:10244: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 {
-            // InternalMenuDsl.g:10117:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
-            // InternalMenuDsl.g:10118:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
+            // InternalMenuDsl.g:10248:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
+            // InternalMenuDsl.g:10249:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_71);
             rule__XClosure__Group__1__Impl();
 
             state._fsp--;
@@ -34316,27 +34747,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__1__Impl"
-    // InternalMenuDsl.g:10125:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
+    // InternalMenuDsl.g:10256: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 {
-            // InternalMenuDsl.g:10129:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
-            // InternalMenuDsl.g:10130:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalMenuDsl.g:10260:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
+            // InternalMenuDsl.g:10261:1: ( ( rule__XClosure__Group_1__0 )? )
             {
-            // InternalMenuDsl.g:10130:1: ( ( rule__XClosure__Group_1__0 )? )
-            // InternalMenuDsl.g:10131:2: ( rule__XClosure__Group_1__0 )?
+            // InternalMenuDsl.g:10261:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalMenuDsl.g:10262:2: ( rule__XClosure__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:10132:2: ( rule__XClosure__Group_1__0 )?
-            int alt94=2;
-            alt94 = dfa94.predict(input);
-            switch (alt94) {
+            // InternalMenuDsl.g:10263:2: ( rule__XClosure__Group_1__0 )?
+            int alt92=2;
+            alt92 = dfa92.predict(input);
+            switch (alt92) {
                 case 1 :
-                    // InternalMenuDsl.g:10132:3: rule__XClosure__Group_1__0
+                    // InternalMenuDsl.g:10263:3: rule__XClosure__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1__0();
@@ -34374,16 +34805,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__2"
-    // InternalMenuDsl.g:10140:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
+    // InternalMenuDsl.g:10271: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 {
-            // InternalMenuDsl.g:10144:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
-            // InternalMenuDsl.g:10145:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
+            // InternalMenuDsl.g:10275:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
+            // InternalMenuDsl.g:10276:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
             {
-            pushFollow(FOLLOW_69);
+            pushFollow(FOLLOW_72);
             rule__XClosure__Group__2__Impl();
 
             state._fsp--;
@@ -34412,23 +34843,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__2__Impl"
-    // InternalMenuDsl.g:10152:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
+    // InternalMenuDsl.g:10283:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
     public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10156:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
-            // InternalMenuDsl.g:10157:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalMenuDsl.g:10287:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
+            // InternalMenuDsl.g:10288:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
             {
-            // InternalMenuDsl.g:10157:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
-            // InternalMenuDsl.g:10158:2: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalMenuDsl.g:10288:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalMenuDsl.g:10289:2: ( rule__XClosure__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionAssignment_2()); 
             }
-            // InternalMenuDsl.g:10159:2: ( rule__XClosure__ExpressionAssignment_2 )
-            // InternalMenuDsl.g:10159:3: rule__XClosure__ExpressionAssignment_2
+            // InternalMenuDsl.g:10290:2: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalMenuDsl.g:10290:3: rule__XClosure__ExpressionAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__ExpressionAssignment_2();
@@ -34463,14 +34894,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__3"
-    // InternalMenuDsl.g:10167:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
+    // InternalMenuDsl.g:10298:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
     public final void rule__XClosure__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10171:1: ( rule__XClosure__Group__3__Impl )
-            // InternalMenuDsl.g:10172:2: rule__XClosure__Group__3__Impl
+            // InternalMenuDsl.g:10302:1: ( rule__XClosure__Group__3__Impl )
+            // InternalMenuDsl.g:10303:2: rule__XClosure__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group__3__Impl();
@@ -34496,22 +34927,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group__3__Impl"
-    // InternalMenuDsl.g:10178:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
+    // InternalMenuDsl.g:10309:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
     public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10182:1: ( ( ']' ) )
-            // InternalMenuDsl.g:10183:1: ( ']' )
+            // InternalMenuDsl.g:10313:1: ( ( ']' ) )
+            // InternalMenuDsl.g:10314:1: ( ']' )
             {
-            // InternalMenuDsl.g:10183:1: ( ']' )
-            // InternalMenuDsl.g:10184:2: ']'
+            // InternalMenuDsl.g:10314:1: ( ']' )
+            // InternalMenuDsl.g:10315:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,64,FOLLOW_2); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -34537,14 +34968,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0"
-    // InternalMenuDsl.g:10194:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
+    // InternalMenuDsl.g:10325: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 {
-            // InternalMenuDsl.g:10198:1: ( rule__XClosure__Group_0__0__Impl )
-            // InternalMenuDsl.g:10199:2: rule__XClosure__Group_0__0__Impl
+            // InternalMenuDsl.g:10329:1: ( rule__XClosure__Group_0__0__Impl )
+            // InternalMenuDsl.g:10330:2: rule__XClosure__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0__Impl();
@@ -34570,23 +35001,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0__Impl"
-    // InternalMenuDsl.g:10205:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
+    // InternalMenuDsl.g:10336: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 {
-            // InternalMenuDsl.g:10209:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
-            // InternalMenuDsl.g:10210:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalMenuDsl.g:10340:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
+            // InternalMenuDsl.g:10341:1: ( ( rule__XClosure__Group_0_0__0 ) )
             {
-            // InternalMenuDsl.g:10210:1: ( ( rule__XClosure__Group_0_0__0 ) )
-            // InternalMenuDsl.g:10211:2: ( rule__XClosure__Group_0_0__0 )
+            // InternalMenuDsl.g:10341:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalMenuDsl.g:10342:2: ( rule__XClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0_0()); 
             }
-            // InternalMenuDsl.g:10212:2: ( rule__XClosure__Group_0_0__0 )
-            // InternalMenuDsl.g:10212:3: rule__XClosure__Group_0_0__0
+            // InternalMenuDsl.g:10343:2: ( rule__XClosure__Group_0_0__0 )
+            // InternalMenuDsl.g:10343:3: rule__XClosure__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__0();
@@ -34621,16 +35052,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0"
-    // InternalMenuDsl.g:10221:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
+    // InternalMenuDsl.g:10352: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 {
-            // InternalMenuDsl.g:10225:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
-            // InternalMenuDsl.g:10226:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
+            // InternalMenuDsl.g:10356:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
+            // InternalMenuDsl.g:10357:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__XClosure__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -34659,23 +35090,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0__Impl"
-    // InternalMenuDsl.g:10233:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:10364:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10237:1: ( ( () ) )
-            // InternalMenuDsl.g:10238:1: ( () )
+            // InternalMenuDsl.g:10368:1: ( ( () ) )
+            // InternalMenuDsl.g:10369:1: ( () )
             {
-            // InternalMenuDsl.g:10238:1: ( () )
-            // InternalMenuDsl.g:10239:2: ()
+            // InternalMenuDsl.g:10369:1: ( () )
+            // InternalMenuDsl.g:10370:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // InternalMenuDsl.g:10240:2: ()
-            // InternalMenuDsl.g:10240:3: 
+            // InternalMenuDsl.g:10371:2: ()
+            // InternalMenuDsl.g:10371:3: 
             {
             }
 
@@ -34700,14 +35131,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1"
-    // InternalMenuDsl.g:10248:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
+    // InternalMenuDsl.g:10379: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 {
-            // InternalMenuDsl.g:10252:1: ( rule__XClosure__Group_0_0__1__Impl )
-            // InternalMenuDsl.g:10253:2: rule__XClosure__Group_0_0__1__Impl
+            // InternalMenuDsl.g:10383:1: ( rule__XClosure__Group_0_0__1__Impl )
+            // InternalMenuDsl.g:10384:2: rule__XClosure__Group_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1__Impl();
@@ -34733,22 +35164,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1__Impl"
-    // InternalMenuDsl.g:10259:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
+    // InternalMenuDsl.g:10390:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
     public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10263:1: ( ( '[' ) )
-            // InternalMenuDsl.g:10264:1: ( '[' )
+            // InternalMenuDsl.g:10394:1: ( ( '[' ) )
+            // InternalMenuDsl.g:10395:1: ( '[' )
             {
-            // InternalMenuDsl.g:10264:1: ( '[' )
-            // InternalMenuDsl.g:10265:2: '['
+            // InternalMenuDsl.g:10395:1: ( '[' )
+            // InternalMenuDsl.g:10396:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
-            match(input,66,FOLLOW_2); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
@@ -34774,14 +35205,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1__0"
-    // InternalMenuDsl.g:10275:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
+    // InternalMenuDsl.g:10406: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 {
-            // InternalMenuDsl.g:10279:1: ( rule__XClosure__Group_1__0__Impl )
-            // InternalMenuDsl.g:10280:2: rule__XClosure__Group_1__0__Impl
+            // InternalMenuDsl.g:10410:1: ( rule__XClosure__Group_1__0__Impl )
+            // InternalMenuDsl.g:10411:2: rule__XClosure__Group_1__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1__0__Impl();
@@ -34807,23 +35238,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1__0__Impl"
-    // InternalMenuDsl.g:10286:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
+    // InternalMenuDsl.g:10417: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 {
-            // InternalMenuDsl.g:10290:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
-            // InternalMenuDsl.g:10291:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalMenuDsl.g:10421:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
+            // InternalMenuDsl.g:10422:1: ( ( rule__XClosure__Group_1_0__0 ) )
             {
-            // InternalMenuDsl.g:10291:1: ( ( rule__XClosure__Group_1_0__0 ) )
-            // InternalMenuDsl.g:10292:2: ( rule__XClosure__Group_1_0__0 )
+            // InternalMenuDsl.g:10422:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalMenuDsl.g:10423:2: ( rule__XClosure__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0()); 
             }
-            // InternalMenuDsl.g:10293:2: ( rule__XClosure__Group_1_0__0 )
-            // InternalMenuDsl.g:10293:3: rule__XClosure__Group_1_0__0
+            // InternalMenuDsl.g:10424:2: ( rule__XClosure__Group_1_0__0 )
+            // InternalMenuDsl.g:10424:3: rule__XClosure__Group_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__0();
@@ -34858,16 +35289,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0"
-    // InternalMenuDsl.g:10302:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
+    // InternalMenuDsl.g:10433: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 {
-            // InternalMenuDsl.g:10306:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
-            // InternalMenuDsl.g:10307:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
+            // InternalMenuDsl.g:10437:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
+            // InternalMenuDsl.g:10438:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
             {
-            pushFollow(FOLLOW_70);
+            pushFollow(FOLLOW_73);
             rule__XClosure__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -34896,31 +35327,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0__Impl"
-    // InternalMenuDsl.g:10314:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
+    // InternalMenuDsl.g:10445: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 {
-            // InternalMenuDsl.g:10318:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
-            // InternalMenuDsl.g:10319:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalMenuDsl.g:10449:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
+            // InternalMenuDsl.g:10450:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
             {
-            // InternalMenuDsl.g:10319:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
-            // InternalMenuDsl.g:10320:2: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalMenuDsl.g:10450:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalMenuDsl.g:10451:2: ( rule__XClosure__Group_1_0_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0()); 
             }
-            // InternalMenuDsl.g:10321:2: ( rule__XClosure__Group_1_0_0__0 )?
-            int alt95=2;
-            int LA95_0 = input.LA(1);
+            // InternalMenuDsl.g:10452:2: ( rule__XClosure__Group_1_0_0__0 )?
+            int alt93=2;
+            int LA93_0 = input.LA(1);
 
-            if ( (LA95_0==RULE_ID||LA95_0==31||LA95_0==61) ) {
-                alt95=1;
+            if ( (LA93_0==RULE_ID||LA93_0==31||LA93_0==63) ) {
+                alt93=1;
             }
-            switch (alt95) {
+            switch (alt93) {
                 case 1 :
-                    // InternalMenuDsl.g:10321:3: rule__XClosure__Group_1_0_0__0
+                    // InternalMenuDsl.g:10452:3: rule__XClosure__Group_1_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1_0_0__0();
@@ -34958,14 +35389,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1"
-    // InternalMenuDsl.g:10329:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
+    // InternalMenuDsl.g:10460: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 {
-            // InternalMenuDsl.g:10333:1: ( rule__XClosure__Group_1_0__1__Impl )
-            // InternalMenuDsl.g:10334:2: rule__XClosure__Group_1_0__1__Impl
+            // InternalMenuDsl.g:10464:1: ( rule__XClosure__Group_1_0__1__Impl )
+            // InternalMenuDsl.g:10465:2: rule__XClosure__Group_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1__Impl();
@@ -34991,23 +35422,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1__Impl"
-    // InternalMenuDsl.g:10340:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
+    // InternalMenuDsl.g:10471: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 {
-            // InternalMenuDsl.g:10344:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
-            // InternalMenuDsl.g:10345:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:10475:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
+            // InternalMenuDsl.g:10476:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
             {
-            // InternalMenuDsl.g:10345:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
-            // InternalMenuDsl.g:10346:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalMenuDsl.g:10476:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalMenuDsl.g:10477:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxAssignment_1_0_1()); 
             }
-            // InternalMenuDsl.g:10347:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
-            // InternalMenuDsl.g:10347:3: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
+            // InternalMenuDsl.g:10478:2: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalMenuDsl.g:10478:3: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__ExplicitSyntaxAssignment_1_0_1();
@@ -35042,16 +35473,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0"
-    // InternalMenuDsl.g:10356:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
+    // InternalMenuDsl.g:10487: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 {
-            // InternalMenuDsl.g:10360:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
-            // InternalMenuDsl.g:10361:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
+            // InternalMenuDsl.g:10491:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
+            // InternalMenuDsl.g:10492:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XClosure__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -35080,23 +35511,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0__Impl"
-    // InternalMenuDsl.g:10368:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
+    // InternalMenuDsl.g:10499: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 {
-            // InternalMenuDsl.g:10372:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
-            // InternalMenuDsl.g:10373:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalMenuDsl.g:10503:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
+            // InternalMenuDsl.g:10504:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
             {
-            // InternalMenuDsl.g:10373:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
-            // InternalMenuDsl.g:10374:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalMenuDsl.g:10504:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalMenuDsl.g:10505:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:10375:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
-            // InternalMenuDsl.g:10375:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
+            // InternalMenuDsl.g:10506:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalMenuDsl.g:10506:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0();
@@ -35131,14 +35562,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1"
-    // InternalMenuDsl.g:10383:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:10514: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 {
-            // InternalMenuDsl.g:10387:1: ( rule__XClosure__Group_1_0_0__1__Impl )
-            // InternalMenuDsl.g:10388:2: rule__XClosure__Group_1_0_0__1__Impl
+            // InternalMenuDsl.g:10518:1: ( rule__XClosure__Group_1_0_0__1__Impl )
+            // InternalMenuDsl.g:10519:2: rule__XClosure__Group_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1__Impl();
@@ -35164,37 +35595,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1__Impl"
-    // InternalMenuDsl.g:10394:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
+    // InternalMenuDsl.g:10525: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 {
-            // InternalMenuDsl.g:10398:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
-            // InternalMenuDsl.g:10399:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalMenuDsl.g:10529:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
+            // InternalMenuDsl.g:10530:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
             {
-            // InternalMenuDsl.g:10399:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
-            // InternalMenuDsl.g:10400:2: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalMenuDsl.g:10530:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalMenuDsl.g:10531:2: ( rule__XClosure__Group_1_0_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0_1()); 
             }
-            // InternalMenuDsl.g:10401:2: ( rule__XClosure__Group_1_0_0_1__0 )*
-            loop96:
+            // InternalMenuDsl.g:10532:2: ( rule__XClosure__Group_1_0_0_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==63) ) {
-                    alt96=1;
+                if ( (LA94_0==65) ) {
+                    alt94=1;
                 }
 
 
-                switch (alt96) {
+                switch (alt94) {
             	case 1 :
-            	    // InternalMenuDsl.g:10401:3: rule__XClosure__Group_1_0_0_1__0
+            	    // InternalMenuDsl.g:10532:3: rule__XClosure__Group_1_0_0_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XClosure__Group_1_0_0_1__0();
 
             	    state._fsp--;
@@ -35204,7 +35635,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop96;
+            	    break loop94;
                 }
             } while (true);
 
@@ -35233,16 +35664,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0"
-    // InternalMenuDsl.g:10410: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 ;
+    // InternalMenuDsl.g:10541: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 {
-            // InternalMenuDsl.g:10414:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
-            // InternalMenuDsl.g:10415:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
+            // InternalMenuDsl.g:10545:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
+            // InternalMenuDsl.g:10546:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XClosure__Group_1_0_0_1__0__Impl();
 
             state._fsp--;
@@ -35271,22 +35702,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0__Impl"
-    // InternalMenuDsl.g:10422:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:10553: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 {
-            // InternalMenuDsl.g:10426:1: ( ( ',' ) )
-            // InternalMenuDsl.g:10427:1: ( ',' )
+            // InternalMenuDsl.g:10557:1: ( ( ',' ) )
+            // InternalMenuDsl.g:10558:1: ( ',' )
             {
-            // InternalMenuDsl.g:10427:1: ( ',' )
-            // InternalMenuDsl.g:10428:2: ','
+            // InternalMenuDsl.g:10558:1: ( ',' )
+            // InternalMenuDsl.g:10559:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
@@ -35312,14 +35743,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1"
-    // InternalMenuDsl.g:10437:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
+    // InternalMenuDsl.g:10568: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 {
-            // InternalMenuDsl.g:10441:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
-            // InternalMenuDsl.g:10442:2: rule__XClosure__Group_1_0_0_1__1__Impl
+            // InternalMenuDsl.g:10572:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
+            // InternalMenuDsl.g:10573:2: rule__XClosure__Group_1_0_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1__Impl();
@@ -35345,23 +35776,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1__Impl"
-    // InternalMenuDsl.g:10448:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
+    // InternalMenuDsl.g:10579: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 {
-            // InternalMenuDsl.g:10452:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
-            // InternalMenuDsl.g:10453:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalMenuDsl.g:10583:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
+            // InternalMenuDsl.g:10584:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
             {
-            // InternalMenuDsl.g:10453:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
-            // InternalMenuDsl.g:10454:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalMenuDsl.g:10584:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalMenuDsl.g:10585:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_1_1()); 
             }
-            // InternalMenuDsl.g:10455:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
-            // InternalMenuDsl.g:10455:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
+            // InternalMenuDsl.g:10586:2: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalMenuDsl.g:10586:3: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1();
@@ -35396,16 +35827,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0"
-    // InternalMenuDsl.g:10464:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
+    // InternalMenuDsl.g:10595: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 {
-            // InternalMenuDsl.g:10468:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
-            // InternalMenuDsl.g:10469:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
+            // InternalMenuDsl.g:10599:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
+            // InternalMenuDsl.g:10600:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
             {
-            pushFollow(FOLLOW_68);
+            pushFollow(FOLLOW_71);
             rule__XExpressionInClosure__Group__0__Impl();
 
             state._fsp--;
@@ -35434,23 +35865,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0__Impl"
-    // InternalMenuDsl.g:10476:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:10607:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
     public final void rule__XExpressionInClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10480:1: ( ( () ) )
-            // InternalMenuDsl.g:10481:1: ( () )
+            // InternalMenuDsl.g:10611:1: ( ( () ) )
+            // InternalMenuDsl.g:10612:1: ( () )
             {
-            // InternalMenuDsl.g:10481:1: ( () )
-            // InternalMenuDsl.g:10482:2: ()
+            // InternalMenuDsl.g:10612:1: ( () )
+            // InternalMenuDsl.g:10613:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getXBlockExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:10483:2: ()
-            // InternalMenuDsl.g:10483:3: 
+            // InternalMenuDsl.g:10614:2: ()
+            // InternalMenuDsl.g:10614:3: 
             {
             }
 
@@ -35475,14 +35906,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1"
-    // InternalMenuDsl.g:10491:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
+    // InternalMenuDsl.g:10622:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
     public final void rule__XExpressionInClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10495:1: ( rule__XExpressionInClosure__Group__1__Impl )
-            // InternalMenuDsl.g:10496:2: rule__XExpressionInClosure__Group__1__Impl
+            // InternalMenuDsl.g:10626:1: ( rule__XExpressionInClosure__Group__1__Impl )
+            // InternalMenuDsl.g:10627:2: rule__XExpressionInClosure__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1__Impl();
@@ -35508,37 +35939,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1__Impl"
-    // InternalMenuDsl.g:10502:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:10633: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 {
-            // InternalMenuDsl.g:10506:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
-            // InternalMenuDsl.g:10507:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalMenuDsl.g:10637:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
+            // InternalMenuDsl.g:10638:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:10507:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
-            // InternalMenuDsl.g:10508:2: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalMenuDsl.g:10638:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalMenuDsl.g:10639:2: ( rule__XExpressionInClosure__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:10509:2: ( rule__XExpressionInClosure__Group_1__0 )*
-            loop97:
+            // InternalMenuDsl.g:10640:2: ( rule__XExpressionInClosure__Group_1__0 )*
+            loop95:
             do {
-                int alt97=2;
-                int LA97_0 = input.LA(1);
+                int alt95=2;
+                int LA95_0 = input.LA(1);
 
-                if ( ((LA97_0>=RULE_STRING && LA97_0<=RULE_DECIMAL)||LA97_0==27||(LA97_0>=34 && LA97_0<=35)||LA97_0==40||(LA97_0>=44 && LA97_0<=50)||LA97_0==52||LA97_0==61||(LA97_0>=65 && LA97_0<=66)||LA97_0==69||LA97_0==71||(LA97_0>=75 && LA97_0<=83)||LA97_0==85||(LA97_0>=104 && LA97_0<=105)) ) {
-                    alt97=1;
+                if ( ((LA95_0>=RULE_STRING && LA95_0<=RULE_DECIMAL)||LA95_0==27||(LA95_0>=34 && LA95_0<=35)||LA95_0==40||(LA95_0>=44 && LA95_0<=50)||LA95_0==57||LA95_0==63||(LA95_0>=67 && LA95_0<=68)||LA95_0==71||LA95_0==73||(LA95_0>=77 && LA95_0<=85)||LA95_0==87||(LA95_0>=106 && LA95_0<=107)) ) {
+                    alt95=1;
                 }
 
 
-                switch (alt97) {
+                switch (alt95) {
             	case 1 :
-            	    // InternalMenuDsl.g:10509:3: rule__XExpressionInClosure__Group_1__0
+            	    // InternalMenuDsl.g:10640:3: rule__XExpressionInClosure__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_71);
+            	    pushFollow(FOLLOW_74);
             	    rule__XExpressionInClosure__Group_1__0();
 
             	    state._fsp--;
@@ -35548,7 +35979,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop97;
+            	    break loop95;
                 }
             } while (true);
 
@@ -35577,16 +36008,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0"
-    // InternalMenuDsl.g:10518:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
+    // InternalMenuDsl.g:10649: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 {
-            // InternalMenuDsl.g:10522:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
-            // InternalMenuDsl.g:10523:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
+            // InternalMenuDsl.g:10653:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
+            // InternalMenuDsl.g:10654:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_21);
             rule__XExpressionInClosure__Group_1__0__Impl();
 
             state._fsp--;
@@ -35615,23 +36046,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0__Impl"
-    // InternalMenuDsl.g:10530:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
+    // InternalMenuDsl.g:10661: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 {
-            // InternalMenuDsl.g:10534:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
-            // InternalMenuDsl.g:10535:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalMenuDsl.g:10665:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
+            // InternalMenuDsl.g:10666:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
             {
-            // InternalMenuDsl.g:10535:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
-            // InternalMenuDsl.g:10536:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalMenuDsl.g:10666:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalMenuDsl.g:10667:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsAssignment_1_0()); 
             }
-            // InternalMenuDsl.g:10537:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
-            // InternalMenuDsl.g:10537:3: rule__XExpressionInClosure__ExpressionsAssignment_1_0
+            // InternalMenuDsl.g:10668:2: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalMenuDsl.g:10668:3: rule__XExpressionInClosure__ExpressionsAssignment_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__ExpressionsAssignment_1_0();
@@ -35666,14 +36097,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1"
-    // InternalMenuDsl.g:10545:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
+    // InternalMenuDsl.g:10676: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 {
-            // InternalMenuDsl.g:10549:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
-            // InternalMenuDsl.g:10550:2: rule__XExpressionInClosure__Group_1__1__Impl
+            // InternalMenuDsl.g:10680:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
+            // InternalMenuDsl.g:10681:2: rule__XExpressionInClosure__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1__Impl();
@@ -35699,33 +36130,33 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1__Impl"
-    // InternalMenuDsl.g:10556:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
+    // InternalMenuDsl.g:10687:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
     public final void rule__XExpressionInClosure__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10560:1: ( ( ( ';' )? ) )
-            // InternalMenuDsl.g:10561:1: ( ( ';' )? )
+            // InternalMenuDsl.g:10691:1: ( ( ( ';' )? ) )
+            // InternalMenuDsl.g:10692:1: ( ( ';' )? )
             {
-            // InternalMenuDsl.g:10561:1: ( ( ';' )? )
-            // InternalMenuDsl.g:10562:2: ( ';' )?
+            // InternalMenuDsl.g:10692:1: ( ( ';' )? )
+            // InternalMenuDsl.g:10693:2: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1()); 
             }
-            // InternalMenuDsl.g:10563:2: ( ';' )?
-            int alt98=2;
-            int LA98_0 = input.LA(1);
+            // InternalMenuDsl.g:10694:2: ( ';' )?
+            int alt96=2;
+            int LA96_0 = input.LA(1);
 
-            if ( (LA98_0==59) ) {
-                alt98=1;
+            if ( (LA96_0==61) ) {
+                alt96=1;
             }
-            switch (alt98) {
+            switch (alt96) {
                 case 1 :
-                    // InternalMenuDsl.g:10563:3: ';'
+                    // InternalMenuDsl.g:10694:3: ';'
                     {
-                    match(input,59,FOLLOW_2); if (state.failed) return ;
+                    match(input,61,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -35757,16 +36188,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group__0"
-    // InternalMenuDsl.g:10572:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
+    // InternalMenuDsl.g:10703: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 {
-            // InternalMenuDsl.g:10576:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
-            // InternalMenuDsl.g:10577:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
+            // InternalMenuDsl.g:10707:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
+            // InternalMenuDsl.g:10708:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XShortClosure__Group__0__Impl();
 
             state._fsp--;
@@ -35795,23 +36226,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group__0__Impl"
-    // InternalMenuDsl.g:10584:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
+    // InternalMenuDsl.g:10715: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 {
-            // InternalMenuDsl.g:10588:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
-            // InternalMenuDsl.g:10589:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalMenuDsl.g:10719:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
+            // InternalMenuDsl.g:10720:1: ( ( rule__XShortClosure__Group_0__0 ) )
             {
-            // InternalMenuDsl.g:10589:1: ( ( rule__XShortClosure__Group_0__0 ) )
-            // InternalMenuDsl.g:10590:2: ( rule__XShortClosure__Group_0__0 )
+            // InternalMenuDsl.g:10720:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalMenuDsl.g:10721:2: ( rule__XShortClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0()); 
             }
-            // InternalMenuDsl.g:10591:2: ( rule__XShortClosure__Group_0__0 )
-            // InternalMenuDsl.g:10591:3: rule__XShortClosure__Group_0__0
+            // InternalMenuDsl.g:10722:2: ( rule__XShortClosure__Group_0__0 )
+            // InternalMenuDsl.g:10722:3: rule__XShortClosure__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0();
@@ -35846,14 +36277,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group__1"
-    // InternalMenuDsl.g:10599:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
+    // InternalMenuDsl.g:10730:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
     public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10603:1: ( rule__XShortClosure__Group__1__Impl )
-            // InternalMenuDsl.g:10604:2: rule__XShortClosure__Group__1__Impl
+            // InternalMenuDsl.g:10734:1: ( rule__XShortClosure__Group__1__Impl )
+            // InternalMenuDsl.g:10735:2: rule__XShortClosure__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1__Impl();
@@ -35879,23 +36310,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group__1__Impl"
-    // InternalMenuDsl.g:10610:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
+    // InternalMenuDsl.g:10741:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
     public final void rule__XShortClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10614:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
-            // InternalMenuDsl.g:10615:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalMenuDsl.g:10745:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
+            // InternalMenuDsl.g:10746:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
             {
-            // InternalMenuDsl.g:10615:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
-            // InternalMenuDsl.g:10616:2: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalMenuDsl.g:10746:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalMenuDsl.g:10747:2: ( rule__XShortClosure__ExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionAssignment_1()); 
             }
-            // InternalMenuDsl.g:10617:2: ( rule__XShortClosure__ExpressionAssignment_1 )
-            // InternalMenuDsl.g:10617:3: rule__XShortClosure__ExpressionAssignment_1
+            // InternalMenuDsl.g:10748:2: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalMenuDsl.g:10748:3: rule__XShortClosure__ExpressionAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__ExpressionAssignment_1();
@@ -35930,14 +36361,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0"
-    // InternalMenuDsl.g:10626:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
+    // InternalMenuDsl.g:10757: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 {
-            // InternalMenuDsl.g:10630:1: ( rule__XShortClosure__Group_0__0__Impl )
-            // InternalMenuDsl.g:10631:2: rule__XShortClosure__Group_0__0__Impl
+            // InternalMenuDsl.g:10761:1: ( rule__XShortClosure__Group_0__0__Impl )
+            // InternalMenuDsl.g:10762:2: rule__XShortClosure__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0__Impl();
@@ -35963,23 +36394,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0__Impl"
-    // InternalMenuDsl.g:10637:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
+    // InternalMenuDsl.g:10768: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 {
-            // InternalMenuDsl.g:10641:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
-            // InternalMenuDsl.g:10642:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalMenuDsl.g:10772:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
+            // InternalMenuDsl.g:10773:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
             {
-            // InternalMenuDsl.g:10642:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
-            // InternalMenuDsl.g:10643:2: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalMenuDsl.g:10773:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalMenuDsl.g:10774:2: ( rule__XShortClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0()); 
             }
-            // InternalMenuDsl.g:10644:2: ( rule__XShortClosure__Group_0_0__0 )
-            // InternalMenuDsl.g:10644:3: rule__XShortClosure__Group_0_0__0
+            // InternalMenuDsl.g:10775:2: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalMenuDsl.g:10775:3: rule__XShortClosure__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__0();
@@ -36014,16 +36445,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0"
-    // InternalMenuDsl.g:10653:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
+    // InternalMenuDsl.g:10784: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 {
-            // InternalMenuDsl.g:10657:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
-            // InternalMenuDsl.g:10658:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
+            // InternalMenuDsl.g:10788:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
+            // InternalMenuDsl.g:10789:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_70);
+            pushFollow(FOLLOW_73);
             rule__XShortClosure__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -36052,23 +36483,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0__Impl"
-    // InternalMenuDsl.g:10665:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:10796:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10669:1: ( ( () ) )
-            // InternalMenuDsl.g:10670:1: ( () )
+            // InternalMenuDsl.g:10800:1: ( ( () ) )
+            // InternalMenuDsl.g:10801:1: ( () )
             {
-            // InternalMenuDsl.g:10670:1: ( () )
-            // InternalMenuDsl.g:10671:2: ()
+            // InternalMenuDsl.g:10801:1: ( () )
+            // InternalMenuDsl.g:10802:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // InternalMenuDsl.g:10672:2: ()
-            // InternalMenuDsl.g:10672:3: 
+            // InternalMenuDsl.g:10803:2: ()
+            // InternalMenuDsl.g:10803:3: 
             {
             }
 
@@ -36093,16 +36524,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1"
-    // InternalMenuDsl.g:10680:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
+    // InternalMenuDsl.g:10811: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 {
-            // InternalMenuDsl.g:10684:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
-            // InternalMenuDsl.g:10685:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
+            // InternalMenuDsl.g:10815:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
+            // InternalMenuDsl.g:10816:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
             {
-            pushFollow(FOLLOW_70);
+            pushFollow(FOLLOW_73);
             rule__XShortClosure__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -36131,31 +36562,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1__Impl"
-    // InternalMenuDsl.g:10692:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
+    // InternalMenuDsl.g:10823: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 {
-            // InternalMenuDsl.g:10696:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
-            // InternalMenuDsl.g:10697:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalMenuDsl.g:10827:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
+            // InternalMenuDsl.g:10828:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
             {
-            // InternalMenuDsl.g:10697:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
-            // InternalMenuDsl.g:10698:2: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalMenuDsl.g:10828:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalMenuDsl.g:10829:2: ( rule__XShortClosure__Group_0_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1()); 
             }
-            // InternalMenuDsl.g:10699:2: ( rule__XShortClosure__Group_0_0_1__0 )?
-            int alt99=2;
-            int LA99_0 = input.LA(1);
+            // InternalMenuDsl.g:10830:2: ( rule__XShortClosure__Group_0_0_1__0 )?
+            int alt97=2;
+            int LA97_0 = input.LA(1);
 
-            if ( (LA99_0==RULE_ID||LA99_0==31||LA99_0==61) ) {
-                alt99=1;
+            if ( (LA97_0==RULE_ID||LA97_0==31||LA97_0==63) ) {
+                alt97=1;
             }
-            switch (alt99) {
+            switch (alt97) {
                 case 1 :
-                    // InternalMenuDsl.g:10699:3: rule__XShortClosure__Group_0_0_1__0
+                    // InternalMenuDsl.g:10830:3: rule__XShortClosure__Group_0_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XShortClosure__Group_0_0_1__0();
@@ -36193,14 +36624,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2"
-    // InternalMenuDsl.g:10707:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
+    // InternalMenuDsl.g:10838: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 {
-            // InternalMenuDsl.g:10711:1: ( rule__XShortClosure__Group_0_0__2__Impl )
-            // InternalMenuDsl.g:10712:2: rule__XShortClosure__Group_0_0__2__Impl
+            // InternalMenuDsl.g:10842:1: ( rule__XShortClosure__Group_0_0__2__Impl )
+            // InternalMenuDsl.g:10843:2: rule__XShortClosure__Group_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2__Impl();
@@ -36226,23 +36657,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2__Impl"
-    // InternalMenuDsl.g:10718:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
+    // InternalMenuDsl.g:10849: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 {
-            // InternalMenuDsl.g:10722:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
-            // InternalMenuDsl.g:10723:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalMenuDsl.g:10853:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
+            // InternalMenuDsl.g:10854:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
             {
-            // InternalMenuDsl.g:10723:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
-            // InternalMenuDsl.g:10724:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalMenuDsl.g:10854:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalMenuDsl.g:10855:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxAssignment_0_0_2()); 
             }
-            // InternalMenuDsl.g:10725:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
-            // InternalMenuDsl.g:10725:3: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
+            // InternalMenuDsl.g:10856:2: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalMenuDsl.g:10856:3: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2();
@@ -36277,16 +36708,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0"
-    // InternalMenuDsl.g:10734:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
+    // InternalMenuDsl.g:10865: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 {
-            // InternalMenuDsl.g:10738:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
-            // InternalMenuDsl.g:10739:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
+            // InternalMenuDsl.g:10869:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
+            // InternalMenuDsl.g:10870:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XShortClosure__Group_0_0_1__0__Impl();
 
             state._fsp--;
@@ -36315,23 +36746,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0__Impl"
-    // InternalMenuDsl.g:10746:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
+    // InternalMenuDsl.g:10877: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 {
-            // InternalMenuDsl.g:10750:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
-            // InternalMenuDsl.g:10751:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalMenuDsl.g:10881:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
+            // InternalMenuDsl.g:10882:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
             {
-            // InternalMenuDsl.g:10751:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
-            // InternalMenuDsl.g:10752:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalMenuDsl.g:10882:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalMenuDsl.g:10883:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:10753:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
-            // InternalMenuDsl.g:10753:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
+            // InternalMenuDsl.g:10884:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalMenuDsl.g:10884:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0();
@@ -36366,14 +36797,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1"
-    // InternalMenuDsl.g:10761:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
+    // InternalMenuDsl.g:10892: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 {
-            // InternalMenuDsl.g:10765:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
-            // InternalMenuDsl.g:10766:2: rule__XShortClosure__Group_0_0_1__1__Impl
+            // InternalMenuDsl.g:10896:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
+            // InternalMenuDsl.g:10897:2: rule__XShortClosure__Group_0_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1__Impl();
@@ -36399,37 +36830,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1__Impl"
-    // InternalMenuDsl.g:10772:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
+    // InternalMenuDsl.g:10903: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 {
-            // InternalMenuDsl.g:10776:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
-            // InternalMenuDsl.g:10777:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalMenuDsl.g:10907:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
+            // InternalMenuDsl.g:10908:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
             {
-            // InternalMenuDsl.g:10777:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
-            // InternalMenuDsl.g:10778:2: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalMenuDsl.g:10908:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalMenuDsl.g:10909:2: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1_1()); 
             }
-            // InternalMenuDsl.g:10779:2: ( rule__XShortClosure__Group_0_0_1_1__0 )*
-            loop100:
+            // InternalMenuDsl.g:10910:2: ( rule__XShortClosure__Group_0_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==63) ) {
-                    alt100=1;
+                if ( (LA98_0==65) ) {
+                    alt98=1;
                 }
 
 
-                switch (alt100) {
+                switch (alt98) {
             	case 1 :
-            	    // InternalMenuDsl.g:10779:3: rule__XShortClosure__Group_0_0_1_1__0
+            	    // InternalMenuDsl.g:10910:3: rule__XShortClosure__Group_0_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XShortClosure__Group_0_0_1_1__0();
 
             	    state._fsp--;
@@ -36439,7 +36870,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop100;
+            	    break loop98;
                 }
             } while (true);
 
@@ -36468,16 +36899,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0"
-    // InternalMenuDsl.g:10788: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 ;
+    // InternalMenuDsl.g:10919: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 {
-            // InternalMenuDsl.g:10792:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
-            // InternalMenuDsl.g:10793:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
+            // InternalMenuDsl.g:10923:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
+            // InternalMenuDsl.g:10924:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XShortClosure__Group_0_0_1_1__0__Impl();
 
             state._fsp--;
@@ -36506,22 +36937,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0__Impl"
-    // InternalMenuDsl.g:10800:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:10931: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 {
-            // InternalMenuDsl.g:10804:1: ( ( ',' ) )
-            // InternalMenuDsl.g:10805:1: ( ',' )
+            // InternalMenuDsl.g:10935:1: ( ( ',' ) )
+            // InternalMenuDsl.g:10936:1: ( ',' )
             {
-            // InternalMenuDsl.g:10805:1: ( ',' )
-            // InternalMenuDsl.g:10806:2: ','
+            // InternalMenuDsl.g:10936:1: ( ',' )
+            // InternalMenuDsl.g:10937:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
@@ -36547,14 +36978,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1"
-    // InternalMenuDsl.g:10815:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
+    // InternalMenuDsl.g:10946: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 {
-            // InternalMenuDsl.g:10819:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
-            // InternalMenuDsl.g:10820:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
+            // InternalMenuDsl.g:10950:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
+            // InternalMenuDsl.g:10951:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1__Impl();
@@ -36580,23 +37011,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1__Impl"
-    // InternalMenuDsl.g:10826:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
+    // InternalMenuDsl.g:10957: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 {
-            // InternalMenuDsl.g:10830:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
-            // InternalMenuDsl.g:10831:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalMenuDsl.g:10961:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
+            // InternalMenuDsl.g:10962:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
             {
-            // InternalMenuDsl.g:10831:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
-            // InternalMenuDsl.g:10832:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalMenuDsl.g:10962:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalMenuDsl.g:10963:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_1_1()); 
             }
-            // InternalMenuDsl.g:10833:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
-            // InternalMenuDsl.g:10833:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
+            // InternalMenuDsl.g:10964:2: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalMenuDsl.g:10964:3: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1();
@@ -36631,16 +37062,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0"
-    // InternalMenuDsl.g:10842:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
+    // InternalMenuDsl.g:10973: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 {
-            // InternalMenuDsl.g:10846:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
-            // InternalMenuDsl.g:10847:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
+            // InternalMenuDsl.g:10977:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
+            // InternalMenuDsl.g:10978:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XParenthesizedExpression__Group__0__Impl();
 
             state._fsp--;
@@ -36669,22 +37100,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0__Impl"
-    // InternalMenuDsl.g:10854:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:10985:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__XParenthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10858:1: ( ( '(' ) )
-            // InternalMenuDsl.g:10859:1: ( '(' )
+            // InternalMenuDsl.g:10989:1: ( ( '(' ) )
+            // InternalMenuDsl.g:10990:1: ( '(' )
             {
-            // InternalMenuDsl.g:10859:1: ( '(' )
-            // InternalMenuDsl.g:10860:2: '('
+            // InternalMenuDsl.g:10990:1: ( '(' )
+            // InternalMenuDsl.g:10991:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -36710,16 +37141,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1"
-    // InternalMenuDsl.g:10869:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
+    // InternalMenuDsl.g:11000: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 {
-            // InternalMenuDsl.g:10873:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
-            // InternalMenuDsl.g:10874:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
+            // InternalMenuDsl.g:11004:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
+            // InternalMenuDsl.g:11005:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XParenthesizedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -36748,17 +37179,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1__Impl"
-    // InternalMenuDsl.g:10881:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:11012:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
     public final void rule__XParenthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10885:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:10886:1: ( ruleXExpression )
+            // InternalMenuDsl.g:11016:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:11017:1: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:10886:1: ( ruleXExpression )
-            // InternalMenuDsl.g:10887:2: ruleXExpression
+            // InternalMenuDsl.g:11017:1: ( ruleXExpression )
+            // InternalMenuDsl.g:11018:2: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
@@ -36793,14 +37224,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2"
-    // InternalMenuDsl.g:10896:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
+    // InternalMenuDsl.g:11027:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
     public final void rule__XParenthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10900:1: ( rule__XParenthesizedExpression__Group__2__Impl )
-            // InternalMenuDsl.g:10901:2: rule__XParenthesizedExpression__Group__2__Impl
+            // InternalMenuDsl.g:11031:1: ( rule__XParenthesizedExpression__Group__2__Impl )
+            // InternalMenuDsl.g:11032:2: rule__XParenthesizedExpression__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2__Impl();
@@ -36826,22 +37257,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2__Impl"
-    // InternalMenuDsl.g:10907:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:11038:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XParenthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10911:1: ( ( ')' ) )
-            // InternalMenuDsl.g:10912:1: ( ')' )
+            // InternalMenuDsl.g:11042:1: ( ( ')' ) )
+            // InternalMenuDsl.g:11043:1: ( ')' )
             {
-            // InternalMenuDsl.g:10912:1: ( ')' )
-            // InternalMenuDsl.g:10913:2: ')'
+            // InternalMenuDsl.g:11043:1: ( ')' )
+            // InternalMenuDsl.g:11044:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -36867,16 +37298,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__0"
-    // InternalMenuDsl.g:10923:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
+    // InternalMenuDsl.g:11054: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 {
-            // InternalMenuDsl.g:10927:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
-            // InternalMenuDsl.g:10928:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
+            // InternalMenuDsl.g:11058:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
+            // InternalMenuDsl.g:11059:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
             {
-            pushFollow(FOLLOW_73);
+            pushFollow(FOLLOW_76);
             rule__XIfExpression__Group__0__Impl();
 
             state._fsp--;
@@ -36905,23 +37336,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__0__Impl"
-    // InternalMenuDsl.g:10935:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:11066:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIfExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10939:1: ( ( () ) )
-            // InternalMenuDsl.g:10940:1: ( () )
+            // InternalMenuDsl.g:11070:1: ( ( () ) )
+            // InternalMenuDsl.g:11071:1: ( () )
             {
-            // InternalMenuDsl.g:10940:1: ( () )
-            // InternalMenuDsl.g:10941:2: ()
+            // InternalMenuDsl.g:11071:1: ( () )
+            // InternalMenuDsl.g:11072:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getXIfExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:10942:2: ()
-            // InternalMenuDsl.g:10942:3: 
+            // InternalMenuDsl.g:11073:2: ()
+            // InternalMenuDsl.g:11073:3: 
             {
             }
 
@@ -36946,16 +37377,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__1"
-    // InternalMenuDsl.g:10950:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
+    // InternalMenuDsl.g:11081: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 {
-            // InternalMenuDsl.g:10954:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
-            // InternalMenuDsl.g:10955:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
+            // InternalMenuDsl.g:11085:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
+            // InternalMenuDsl.g:11086:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XIfExpression__Group__1__Impl();
 
             state._fsp--;
@@ -36984,22 +37415,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__1__Impl"
-    // InternalMenuDsl.g:10962:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
+    // InternalMenuDsl.g:11093:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
     public final void rule__XIfExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10966:1: ( ( 'if' ) )
-            // InternalMenuDsl.g:10967:1: ( 'if' )
+            // InternalMenuDsl.g:11097:1: ( ( 'if' ) )
+            // InternalMenuDsl.g:11098:1: ( 'if' )
             {
-            // InternalMenuDsl.g:10967:1: ( 'if' )
-            // InternalMenuDsl.g:10968:2: 'if'
+            // InternalMenuDsl.g:11098:1: ( 'if' )
+            // InternalMenuDsl.g:11099:2: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
-            match(input,69,FOLLOW_2); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
@@ -37025,16 +37456,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__2"
-    // InternalMenuDsl.g:10977:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
+    // InternalMenuDsl.g:11108: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 {
-            // InternalMenuDsl.g:10981:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
-            // InternalMenuDsl.g:10982:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
+            // InternalMenuDsl.g:11112:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
+            // InternalMenuDsl.g:11113:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XIfExpression__Group__2__Impl();
 
             state._fsp--;
@@ -37063,22 +37494,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__2__Impl"
-    // InternalMenuDsl.g:10989:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:11120:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XIfExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:10993:1: ( ( '(' ) )
-            // InternalMenuDsl.g:10994:1: ( '(' )
+            // InternalMenuDsl.g:11124:1: ( ( '(' ) )
+            // InternalMenuDsl.g:11125:1: ( '(' )
             {
-            // InternalMenuDsl.g:10994:1: ( '(' )
-            // InternalMenuDsl.g:10995:2: '('
+            // InternalMenuDsl.g:11125:1: ( '(' )
+            // InternalMenuDsl.g:11126:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -37104,16 +37535,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__3"
-    // InternalMenuDsl.g:11004:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
+    // InternalMenuDsl.g:11135: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 {
-            // InternalMenuDsl.g:11008:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
-            // InternalMenuDsl.g:11009:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
+            // InternalMenuDsl.g:11139:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
+            // InternalMenuDsl.g:11140:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XIfExpression__Group__3__Impl();
 
             state._fsp--;
@@ -37142,23 +37573,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__3__Impl"
-    // InternalMenuDsl.g:11016:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
+    // InternalMenuDsl.g:11147:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
     public final void rule__XIfExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11020:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
-            // InternalMenuDsl.g:11021:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalMenuDsl.g:11151:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
+            // InternalMenuDsl.g:11152:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
             {
-            // InternalMenuDsl.g:11021:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
-            // InternalMenuDsl.g:11022:2: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalMenuDsl.g:11152:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalMenuDsl.g:11153:2: ( rule__XIfExpression__IfAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfAssignment_3()); 
             }
-            // InternalMenuDsl.g:11023:2: ( rule__XIfExpression__IfAssignment_3 )
-            // InternalMenuDsl.g:11023:3: rule__XIfExpression__IfAssignment_3
+            // InternalMenuDsl.g:11154:2: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalMenuDsl.g:11154:3: rule__XIfExpression__IfAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__IfAssignment_3();
@@ -37193,16 +37624,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__4"
-    // InternalMenuDsl.g:11031:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
+    // InternalMenuDsl.g:11162: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 {
-            // InternalMenuDsl.g:11035:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
-            // InternalMenuDsl.g:11036:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
+            // InternalMenuDsl.g:11166:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
+            // InternalMenuDsl.g:11167:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XIfExpression__Group__4__Impl();
 
             state._fsp--;
@@ -37231,22 +37662,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__4__Impl"
-    // InternalMenuDsl.g:11043:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:11174:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XIfExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11047:1: ( ( ')' ) )
-            // InternalMenuDsl.g:11048:1: ( ')' )
+            // InternalMenuDsl.g:11178:1: ( ( ')' ) )
+            // InternalMenuDsl.g:11179:1: ( ')' )
             {
-            // InternalMenuDsl.g:11048:1: ( ')' )
-            // InternalMenuDsl.g:11049:2: ')'
+            // InternalMenuDsl.g:11179:1: ( ')' )
+            // InternalMenuDsl.g:11180:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -37272,16 +37703,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__5"
-    // InternalMenuDsl.g:11058:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
+    // InternalMenuDsl.g:11189: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 {
-            // InternalMenuDsl.g:11062:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
-            // InternalMenuDsl.g:11063:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
+            // InternalMenuDsl.g:11193:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
+            // InternalMenuDsl.g:11194:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
             {
-            pushFollow(FOLLOW_74);
+            pushFollow(FOLLOW_77);
             rule__XIfExpression__Group__5__Impl();
 
             state._fsp--;
@@ -37310,23 +37741,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__5__Impl"
-    // InternalMenuDsl.g:11070:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
+    // InternalMenuDsl.g:11201:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
     public final void rule__XIfExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11074:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
-            // InternalMenuDsl.g:11075:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalMenuDsl.g:11205:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
+            // InternalMenuDsl.g:11206:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
             {
-            // InternalMenuDsl.g:11075:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
-            // InternalMenuDsl.g:11076:2: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalMenuDsl.g:11206:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalMenuDsl.g:11207:2: ( rule__XIfExpression__ThenAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenAssignment_5()); 
             }
-            // InternalMenuDsl.g:11077:2: ( rule__XIfExpression__ThenAssignment_5 )
-            // InternalMenuDsl.g:11077:3: rule__XIfExpression__ThenAssignment_5
+            // InternalMenuDsl.g:11208:2: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalMenuDsl.g:11208:3: rule__XIfExpression__ThenAssignment_5
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__ThenAssignment_5();
@@ -37361,14 +37792,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__6"
-    // InternalMenuDsl.g:11085:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
+    // InternalMenuDsl.g:11216:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
     public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11089:1: ( rule__XIfExpression__Group__6__Impl )
-            // InternalMenuDsl.g:11090:2: rule__XIfExpression__Group__6__Impl
+            // InternalMenuDsl.g:11220:1: ( rule__XIfExpression__Group__6__Impl )
+            // InternalMenuDsl.g:11221:2: rule__XIfExpression__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6__Impl();
@@ -37394,35 +37825,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group__6__Impl"
-    // InternalMenuDsl.g:11096:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
+    // InternalMenuDsl.g:11227: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 {
-            // InternalMenuDsl.g:11100:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
-            // InternalMenuDsl.g:11101:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalMenuDsl.g:11231:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
+            // InternalMenuDsl.g:11232:1: ( ( rule__XIfExpression__Group_6__0 )? )
             {
-            // InternalMenuDsl.g:11101:1: ( ( rule__XIfExpression__Group_6__0 )? )
-            // InternalMenuDsl.g:11102:2: ( rule__XIfExpression__Group_6__0 )?
+            // InternalMenuDsl.g:11232:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalMenuDsl.g:11233:2: ( rule__XIfExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup_6()); 
             }
-            // InternalMenuDsl.g:11103:2: ( rule__XIfExpression__Group_6__0 )?
-            int alt101=2;
-            int LA101_0 = input.LA(1);
+            // InternalMenuDsl.g:11234:2: ( rule__XIfExpression__Group_6__0 )?
+            int alt99=2;
+            int LA99_0 = input.LA(1);
 
-            if ( (LA101_0==70) ) {
-                int LA101_1 = input.LA(2);
+            if ( (LA99_0==72) ) {
+                int LA99_1 = input.LA(2);
 
-                if ( (synpred149_InternalMenuDsl()) ) {
-                    alt101=1;
+                if ( (synpred148_InternalMenuDsl()) ) {
+                    alt99=1;
                 }
             }
-            switch (alt101) {
+            switch (alt99) {
                 case 1 :
-                    // InternalMenuDsl.g:11103:3: rule__XIfExpression__Group_6__0
+                    // InternalMenuDsl.g:11234:3: rule__XIfExpression__Group_6__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XIfExpression__Group_6__0();
@@ -37460,16 +37891,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0"
-    // InternalMenuDsl.g:11112:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
+    // InternalMenuDsl.g:11243: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 {
-            // InternalMenuDsl.g:11116:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
-            // InternalMenuDsl.g:11117:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
+            // InternalMenuDsl.g:11247:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
+            // InternalMenuDsl.g:11248:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XIfExpression__Group_6__0__Impl();
 
             state._fsp--;
@@ -37498,25 +37929,25 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0__Impl"
-    // InternalMenuDsl.g:11124:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
+    // InternalMenuDsl.g:11255:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
     public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11128:1: ( ( ( 'else' ) ) )
-            // InternalMenuDsl.g:11129:1: ( ( 'else' ) )
+            // InternalMenuDsl.g:11259:1: ( ( ( 'else' ) ) )
+            // InternalMenuDsl.g:11260:1: ( ( 'else' ) )
             {
-            // InternalMenuDsl.g:11129:1: ( ( 'else' ) )
-            // InternalMenuDsl.g:11130:2: ( 'else' )
+            // InternalMenuDsl.g:11260:1: ( ( 'else' ) )
+            // InternalMenuDsl.g:11261:2: ( 'else' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0()); 
             }
-            // InternalMenuDsl.g:11131:2: ( 'else' )
-            // InternalMenuDsl.g:11131:3: 'else'
+            // InternalMenuDsl.g:11262:2: ( 'else' )
+            // InternalMenuDsl.g:11262:3: 'else'
             {
-            match(input,70,FOLLOW_2); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -37545,14 +37976,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1"
-    // InternalMenuDsl.g:11139:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
+    // InternalMenuDsl.g:11270: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 {
-            // InternalMenuDsl.g:11143:1: ( rule__XIfExpression__Group_6__1__Impl )
-            // InternalMenuDsl.g:11144:2: rule__XIfExpression__Group_6__1__Impl
+            // InternalMenuDsl.g:11274:1: ( rule__XIfExpression__Group_6__1__Impl )
+            // InternalMenuDsl.g:11275:2: rule__XIfExpression__Group_6__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1__Impl();
@@ -37578,23 +38009,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1__Impl"
-    // InternalMenuDsl.g:11150:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
+    // InternalMenuDsl.g:11281: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 {
-            // InternalMenuDsl.g:11154:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
-            // InternalMenuDsl.g:11155:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalMenuDsl.g:11285:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
+            // InternalMenuDsl.g:11286:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
             {
-            // InternalMenuDsl.g:11155:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
-            // InternalMenuDsl.g:11156:2: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalMenuDsl.g:11286:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalMenuDsl.g:11287:2: ( rule__XIfExpression__ElseAssignment_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseAssignment_6_1()); 
             }
-            // InternalMenuDsl.g:11157:2: ( rule__XIfExpression__ElseAssignment_6_1 )
-            // InternalMenuDsl.g:11157:3: rule__XIfExpression__ElseAssignment_6_1
+            // InternalMenuDsl.g:11288:2: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalMenuDsl.g:11288:3: rule__XIfExpression__ElseAssignment_6_1
             {
             pushFollow(FOLLOW_2);
             rule__XIfExpression__ElseAssignment_6_1();
@@ -37629,16 +38060,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0"
-    // InternalMenuDsl.g:11166:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
+    // InternalMenuDsl.g:11297: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 {
-            // InternalMenuDsl.g:11170:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
-            // InternalMenuDsl.g:11171:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
+            // InternalMenuDsl.g:11301:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
+            // InternalMenuDsl.g:11302:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_75);
+            pushFollow(FOLLOW_78);
             rule__XSwitchExpression__Group__0__Impl();
 
             state._fsp--;
@@ -37667,23 +38098,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0__Impl"
-    // InternalMenuDsl.g:11178:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:11309:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
     public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11182:1: ( ( () ) )
-            // InternalMenuDsl.g:11183:1: ( () )
+            // InternalMenuDsl.g:11313:1: ( ( () ) )
+            // InternalMenuDsl.g:11314:1: ( () )
             {
-            // InternalMenuDsl.g:11183:1: ( () )
-            // InternalMenuDsl.g:11184:2: ()
+            // InternalMenuDsl.g:11314:1: ( () )
+            // InternalMenuDsl.g:11315:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getXSwitchExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:11185:2: ()
-            // InternalMenuDsl.g:11185:3: 
+            // InternalMenuDsl.g:11316:2: ()
+            // InternalMenuDsl.g:11316:3: 
             {
             }
 
@@ -37708,16 +38139,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1"
-    // InternalMenuDsl.g:11193:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
+    // InternalMenuDsl.g:11324: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 {
-            // InternalMenuDsl.g:11197:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
-            // InternalMenuDsl.g:11198:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
+            // InternalMenuDsl.g:11328:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
+            // InternalMenuDsl.g:11329:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_76);
+            pushFollow(FOLLOW_79);
             rule__XSwitchExpression__Group__1__Impl();
 
             state._fsp--;
@@ -37746,22 +38177,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1__Impl"
-    // InternalMenuDsl.g:11205:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
+    // InternalMenuDsl.g:11336:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
     public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11209:1: ( ( 'switch' ) )
-            // InternalMenuDsl.g:11210:1: ( 'switch' )
+            // InternalMenuDsl.g:11340:1: ( ( 'switch' ) )
+            // InternalMenuDsl.g:11341:1: ( 'switch' )
             {
-            // InternalMenuDsl.g:11210:1: ( 'switch' )
-            // InternalMenuDsl.g:11211:2: 'switch'
+            // InternalMenuDsl.g:11341:1: ( 'switch' )
+            // InternalMenuDsl.g:11342:2: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
-            match(input,71,FOLLOW_2); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
@@ -37787,16 +38218,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2"
-    // InternalMenuDsl.g:11220:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
+    // InternalMenuDsl.g:11351: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 {
-            // InternalMenuDsl.g:11224:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
-            // InternalMenuDsl.g:11225:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
+            // InternalMenuDsl.g:11355:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
+            // InternalMenuDsl.g:11356:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_8);
+            pushFollow(FOLLOW_69);
             rule__XSwitchExpression__Group__2__Impl();
 
             state._fsp--;
@@ -37825,23 +38256,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2__Impl"
-    // InternalMenuDsl.g:11232:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
+    // InternalMenuDsl.g:11363:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
     public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11236:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
-            // InternalMenuDsl.g:11237:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalMenuDsl.g:11367:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
+            // InternalMenuDsl.g:11368:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
             {
-            // InternalMenuDsl.g:11237:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
-            // InternalMenuDsl.g:11238:2: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalMenuDsl.g:11368:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalMenuDsl.g:11369:2: ( rule__XSwitchExpression__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getAlternatives_2()); 
             }
-            // InternalMenuDsl.g:11239:2: ( rule__XSwitchExpression__Alternatives_2 )
-            // InternalMenuDsl.g:11239:3: rule__XSwitchExpression__Alternatives_2
+            // InternalMenuDsl.g:11370:2: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalMenuDsl.g:11370:3: rule__XSwitchExpression__Alternatives_2
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Alternatives_2();
@@ -37876,16 +38307,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3"
-    // InternalMenuDsl.g:11247:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
+    // InternalMenuDsl.g:11378: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 {
-            // InternalMenuDsl.g:11251:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
-            // InternalMenuDsl.g:11252:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
+            // InternalMenuDsl.g:11382:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
+            // InternalMenuDsl.g:11383:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_77);
+            pushFollow(FOLLOW_80);
             rule__XSwitchExpression__Group__3__Impl();
 
             state._fsp--;
@@ -37914,22 +38345,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3__Impl"
-    // InternalMenuDsl.g:11259:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
+    // InternalMenuDsl.g:11390:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
     public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11263:1: ( ( '{' ) )
-            // InternalMenuDsl.g:11264:1: ( '{' )
+            // InternalMenuDsl.g:11394:1: ( ( '{' ) )
+            // InternalMenuDsl.g:11395:1: ( '{' )
             {
-            // InternalMenuDsl.g:11264:1: ( '{' )
-            // InternalMenuDsl.g:11265:2: '{'
+            // InternalMenuDsl.g:11395:1: ( '{' )
+            // InternalMenuDsl.g:11396:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,52,FOLLOW_2); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -37955,16 +38386,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4"
-    // InternalMenuDsl.g:11274:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
+    // InternalMenuDsl.g:11405: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 {
-            // InternalMenuDsl.g:11278:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
-            // InternalMenuDsl.g:11279:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
+            // InternalMenuDsl.g:11409:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
+            // InternalMenuDsl.g:11410:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_77);
+            pushFollow(FOLLOW_80);
             rule__XSwitchExpression__Group__4__Impl();
 
             state._fsp--;
@@ -37993,37 +38424,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4__Impl"
-    // InternalMenuDsl.g:11286:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
+    // InternalMenuDsl.g:11417:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
     public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11290:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
-            // InternalMenuDsl.g:11291:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalMenuDsl.g:11421:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
+            // InternalMenuDsl.g:11422:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
             {
-            // InternalMenuDsl.g:11291:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
-            // InternalMenuDsl.g:11292:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalMenuDsl.g:11422:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalMenuDsl.g:11423:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesAssignment_4()); 
             }
-            // InternalMenuDsl.g:11293:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
-            loop102:
+            // InternalMenuDsl.g:11424:2: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            loop100:
             do {
-                int alt102=2;
-                int LA102_0 = input.LA(1);
+                int alt100=2;
+                int LA100_0 = input.LA(1);
 
-                if ( (LA102_0==RULE_ID||LA102_0==31||LA102_0==61||LA102_0==63||LA102_0==72||LA102_0==74) ) {
-                    alt102=1;
+                if ( (LA100_0==RULE_ID||LA100_0==31||LA100_0==63||LA100_0==65||LA100_0==74||LA100_0==76) ) {
+                    alt100=1;
                 }
 
 
-                switch (alt102) {
+                switch (alt100) {
             	case 1 :
-            	    // InternalMenuDsl.g:11293:3: rule__XSwitchExpression__CasesAssignment_4
+            	    // InternalMenuDsl.g:11424:3: rule__XSwitchExpression__CasesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_78);
+            	    pushFollow(FOLLOW_81);
             	    rule__XSwitchExpression__CasesAssignment_4();
 
             	    state._fsp--;
@@ -38033,7 +38464,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop102;
+            	    break loop100;
                 }
             } while (true);
 
@@ -38062,16 +38493,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5"
-    // InternalMenuDsl.g:11301:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
+    // InternalMenuDsl.g:11432: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 {
-            // InternalMenuDsl.g:11305:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
-            // InternalMenuDsl.g:11306:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
+            // InternalMenuDsl.g:11436:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
+            // InternalMenuDsl.g:11437:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_77);
+            pushFollow(FOLLOW_80);
             rule__XSwitchExpression__Group__5__Impl();
 
             state._fsp--;
@@ -38100,31 +38531,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5__Impl"
-    // InternalMenuDsl.g:11313:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
+    // InternalMenuDsl.g:11444: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 {
-            // InternalMenuDsl.g:11317:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
-            // InternalMenuDsl.g:11318:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalMenuDsl.g:11448:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
+            // InternalMenuDsl.g:11449:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
             {
-            // InternalMenuDsl.g:11318:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
-            // InternalMenuDsl.g:11319:2: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalMenuDsl.g:11449:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalMenuDsl.g:11450:2: ( rule__XSwitchExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_5()); 
             }
-            // InternalMenuDsl.g:11320:2: ( rule__XSwitchExpression__Group_5__0 )?
-            int alt103=2;
-            int LA103_0 = input.LA(1);
+            // InternalMenuDsl.g:11451:2: ( rule__XSwitchExpression__Group_5__0 )?
+            int alt101=2;
+            int LA101_0 = input.LA(1);
 
-            if ( (LA103_0==73) ) {
-                alt103=1;
+            if ( (LA101_0==75) ) {
+                alt101=1;
             }
-            switch (alt103) {
+            switch (alt101) {
                 case 1 :
-                    // InternalMenuDsl.g:11320:3: rule__XSwitchExpression__Group_5__0
+                    // InternalMenuDsl.g:11451:3: rule__XSwitchExpression__Group_5__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_5__0();
@@ -38162,14 +38593,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6"
-    // InternalMenuDsl.g:11328:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
+    // InternalMenuDsl.g:11459:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
     public final void rule__XSwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11332:1: ( rule__XSwitchExpression__Group__6__Impl )
-            // InternalMenuDsl.g:11333:2: rule__XSwitchExpression__Group__6__Impl
+            // InternalMenuDsl.g:11463:1: ( rule__XSwitchExpression__Group__6__Impl )
+            // InternalMenuDsl.g:11464:2: rule__XSwitchExpression__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6__Impl();
@@ -38195,22 +38626,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6__Impl"
-    // InternalMenuDsl.g:11339:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
+    // InternalMenuDsl.g:11470:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
     public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11343:1: ( ( '}' ) )
-            // InternalMenuDsl.g:11344:1: ( '}' )
+            // InternalMenuDsl.g:11474:1: ( ( '}' ) )
+            // InternalMenuDsl.g:11475:1: ( '}' )
             {
-            // InternalMenuDsl.g:11344:1: ( '}' )
-            // InternalMenuDsl.g:11345:2: '}'
+            // InternalMenuDsl.g:11475:1: ( '}' )
+            // InternalMenuDsl.g:11476:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
-            match(input,55,FOLLOW_2); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
@@ -38236,16 +38667,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0"
-    // InternalMenuDsl.g:11355:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
+    // InternalMenuDsl.g:11486: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 {
-            // InternalMenuDsl.g:11359:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
-            // InternalMenuDsl.g:11360:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
+            // InternalMenuDsl.g:11490:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
+            // InternalMenuDsl.g:11491:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XSwitchExpression__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -38274,23 +38705,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0__Impl"
-    // InternalMenuDsl.g:11367:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
+    // InternalMenuDsl.g:11498: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 {
-            // InternalMenuDsl.g:11371:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
-            // InternalMenuDsl.g:11372:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalMenuDsl.g:11502:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
+            // InternalMenuDsl.g:11503:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
             {
-            // InternalMenuDsl.g:11372:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
-            // InternalMenuDsl.g:11373:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalMenuDsl.g:11503:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalMenuDsl.g:11504:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0()); 
             }
-            // InternalMenuDsl.g:11374:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
-            // InternalMenuDsl.g:11374:3: rule__XSwitchExpression__Group_2_0_0__0
+            // InternalMenuDsl.g:11505:2: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalMenuDsl.g:11505:3: rule__XSwitchExpression__Group_2_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0();
@@ -38325,16 +38756,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1"
-    // InternalMenuDsl.g:11382:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
+    // InternalMenuDsl.g:11513: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 {
-            // InternalMenuDsl.g:11386:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
-            // InternalMenuDsl.g:11387:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
+            // InternalMenuDsl.g:11517:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
+            // InternalMenuDsl.g:11518:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XSwitchExpression__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -38363,23 +38794,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1__Impl"
-    // InternalMenuDsl.g:11394:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
+    // InternalMenuDsl.g:11525: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 {
-            // InternalMenuDsl.g:11398:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
-            // InternalMenuDsl.g:11399:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalMenuDsl.g:11529:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
+            // InternalMenuDsl.g:11530:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
             {
-            // InternalMenuDsl.g:11399:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
-            // InternalMenuDsl.g:11400:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalMenuDsl.g:11530:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalMenuDsl.g:11531:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_0_1()); 
             }
-            // InternalMenuDsl.g:11401:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
-            // InternalMenuDsl.g:11401:3: rule__XSwitchExpression__SwitchAssignment_2_0_1
+            // InternalMenuDsl.g:11532:2: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalMenuDsl.g:11532:3: rule__XSwitchExpression__SwitchAssignment_2_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_0_1();
@@ -38414,14 +38845,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2"
-    // InternalMenuDsl.g:11409:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
+    // InternalMenuDsl.g:11540: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 {
-            // InternalMenuDsl.g:11413:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
-            // InternalMenuDsl.g:11414:2: rule__XSwitchExpression__Group_2_0__2__Impl
+            // InternalMenuDsl.g:11544:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
+            // InternalMenuDsl.g:11545:2: rule__XSwitchExpression__Group_2_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2__Impl();
@@ -38447,22 +38878,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2__Impl"
-    // InternalMenuDsl.g:11420:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:11551:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
     public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11424:1: ( ( ')' ) )
-            // InternalMenuDsl.g:11425:1: ( ')' )
+            // InternalMenuDsl.g:11555:1: ( ( ')' ) )
+            // InternalMenuDsl.g:11556:1: ( ')' )
             {
-            // InternalMenuDsl.g:11425:1: ( ')' )
-            // InternalMenuDsl.g:11426:2: ')'
+            // InternalMenuDsl.g:11556:1: ( ')' )
+            // InternalMenuDsl.g:11557:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
@@ -38488,14 +38919,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0"
-    // InternalMenuDsl.g:11436:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
+    // InternalMenuDsl.g:11567: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 {
-            // InternalMenuDsl.g:11440:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
-            // InternalMenuDsl.g:11441:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
+            // InternalMenuDsl.g:11571:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
+            // InternalMenuDsl.g:11572:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0__Impl();
@@ -38521,23 +38952,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0__Impl"
-    // InternalMenuDsl.g:11447:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
+    // InternalMenuDsl.g:11578: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 {
-            // InternalMenuDsl.g:11451:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
-            // InternalMenuDsl.g:11452:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalMenuDsl.g:11582:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
+            // InternalMenuDsl.g:11583:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
             {
-            // InternalMenuDsl.g:11452:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
-            // InternalMenuDsl.g:11453:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalMenuDsl.g:11583:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalMenuDsl.g:11584:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0_0()); 
             }
-            // InternalMenuDsl.g:11454:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
-            // InternalMenuDsl.g:11454:3: rule__XSwitchExpression__Group_2_0_0_0__0
+            // InternalMenuDsl.g:11585:2: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalMenuDsl.g:11585:3: rule__XSwitchExpression__Group_2_0_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__0();
@@ -38572,16 +39003,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0"
-    // InternalMenuDsl.g:11463: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 ;
+    // InternalMenuDsl.g:11594: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 {
-            // InternalMenuDsl.g:11467:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
-            // InternalMenuDsl.g:11468:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
+            // InternalMenuDsl.g:11598:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
+            // InternalMenuDsl.g:11599:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XSwitchExpression__Group_2_0_0_0__0__Impl();
 
             state._fsp--;
@@ -38610,22 +39041,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0__Impl"
-    // InternalMenuDsl.g:11475:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:11606: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 {
-            // InternalMenuDsl.g:11479:1: ( ( '(' ) )
-            // InternalMenuDsl.g:11480:1: ( '(' )
+            // InternalMenuDsl.g:11610:1: ( ( '(' ) )
+            // InternalMenuDsl.g:11611:1: ( '(' )
             {
-            // InternalMenuDsl.g:11480:1: ( '(' )
-            // InternalMenuDsl.g:11481:2: '('
+            // InternalMenuDsl.g:11611:1: ( '(' )
+            // InternalMenuDsl.g:11612:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
@@ -38651,16 +39082,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1"
-    // InternalMenuDsl.g:11490: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 ;
+    // InternalMenuDsl.g:11621: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 {
-            // InternalMenuDsl.g:11494:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
-            // InternalMenuDsl.g:11495:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
+            // InternalMenuDsl.g:11625:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
+            // InternalMenuDsl.g:11626:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
             {
-            pushFollow(FOLLOW_79);
+            pushFollow(FOLLOW_82);
             rule__XSwitchExpression__Group_2_0_0_0__1__Impl();
 
             state._fsp--;
@@ -38689,23 +39120,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1__Impl"
-    // InternalMenuDsl.g:11502:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
+    // InternalMenuDsl.g:11633: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 {
-            // InternalMenuDsl.g:11506:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
-            // InternalMenuDsl.g:11507:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalMenuDsl.g:11637:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
+            // InternalMenuDsl.g:11638:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
             {
-            // InternalMenuDsl.g:11507:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
-            // InternalMenuDsl.g:11508:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalMenuDsl.g:11638:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalMenuDsl.g:11639:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_0_0_0_1()); 
             }
-            // InternalMenuDsl.g:11509:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
-            // InternalMenuDsl.g:11509:3: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
+            // InternalMenuDsl.g:11640:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalMenuDsl.g:11640:3: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1();
@@ -38740,14 +39171,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2"
-    // InternalMenuDsl.g:11517:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
+    // InternalMenuDsl.g:11648: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 {
-            // InternalMenuDsl.g:11521:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
-            // InternalMenuDsl.g:11522:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
+            // InternalMenuDsl.g:11652:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
+            // InternalMenuDsl.g:11653:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2__Impl();
@@ -38773,22 +39204,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2__Impl"
-    // InternalMenuDsl.g:11528:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
+    // InternalMenuDsl.g:11659: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 {
-            // InternalMenuDsl.g:11532:1: ( ( ':' ) )
-            // InternalMenuDsl.g:11533:1: ( ':' )
+            // InternalMenuDsl.g:11663:1: ( ( ':' ) )
+            // InternalMenuDsl.g:11664:1: ( ':' )
             {
-            // InternalMenuDsl.g:11533:1: ( ':' )
-            // InternalMenuDsl.g:11534:2: ':'
+            // InternalMenuDsl.g:11664:1: ( ':' )
+            // InternalMenuDsl.g:11665:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
-            match(input,72,FOLLOW_2); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
@@ -38814,16 +39245,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0"
-    // InternalMenuDsl.g:11544:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
+    // InternalMenuDsl.g:11675: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 {
-            // InternalMenuDsl.g:11548:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
-            // InternalMenuDsl.g:11549:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
+            // InternalMenuDsl.g:11679:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
+            // InternalMenuDsl.g:11680:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
             {
-            pushFollow(FOLLOW_76);
+            pushFollow(FOLLOW_79);
             rule__XSwitchExpression__Group_2_1__0__Impl();
 
             state._fsp--;
@@ -38852,27 +39283,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0__Impl"
-    // InternalMenuDsl.g:11556:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
+    // InternalMenuDsl.g:11687: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 {
-            // InternalMenuDsl.g:11560:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
-            // InternalMenuDsl.g:11561:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalMenuDsl.g:11691:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
+            // InternalMenuDsl.g:11692:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
             {
-            // InternalMenuDsl.g:11561:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
-            // InternalMenuDsl.g:11562:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalMenuDsl.g:11692:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalMenuDsl.g:11693:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0()); 
             }
-            // InternalMenuDsl.g:11563:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
-            int alt104=2;
-            alt104 = dfa104.predict(input);
-            switch (alt104) {
+            // InternalMenuDsl.g:11694:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            int alt102=2;
+            alt102 = dfa102.predict(input);
+            switch (alt102) {
                 case 1 :
-                    // InternalMenuDsl.g:11563:3: rule__XSwitchExpression__Group_2_1_0__0
+                    // InternalMenuDsl.g:11694:3: rule__XSwitchExpression__Group_2_1_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1_0__0();
@@ -38910,14 +39341,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1"
-    // InternalMenuDsl.g:11571:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
+    // InternalMenuDsl.g:11702: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 {
-            // InternalMenuDsl.g:11575:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
-            // InternalMenuDsl.g:11576:2: rule__XSwitchExpression__Group_2_1__1__Impl
+            // InternalMenuDsl.g:11706:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
+            // InternalMenuDsl.g:11707:2: rule__XSwitchExpression__Group_2_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1__Impl();
@@ -38943,23 +39374,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1__Impl"
-    // InternalMenuDsl.g:11582:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
+    // InternalMenuDsl.g:11713: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 {
-            // InternalMenuDsl.g:11586:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
-            // InternalMenuDsl.g:11587:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalMenuDsl.g:11717:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
+            // InternalMenuDsl.g:11718:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
             {
-            // InternalMenuDsl.g:11587:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
-            // InternalMenuDsl.g:11588:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalMenuDsl.g:11718:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalMenuDsl.g:11719:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_1_1()); 
             }
-            // InternalMenuDsl.g:11589:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
-            // InternalMenuDsl.g:11589:3: rule__XSwitchExpression__SwitchAssignment_2_1_1
+            // InternalMenuDsl.g:11720:2: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalMenuDsl.g:11720:3: rule__XSwitchExpression__SwitchAssignment_2_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_1_1();
@@ -38994,14 +39425,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0"
-    // InternalMenuDsl.g:11598:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
+    // InternalMenuDsl.g:11729: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 {
-            // InternalMenuDsl.g:11602:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
-            // InternalMenuDsl.g:11603:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
+            // InternalMenuDsl.g:11733:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
+            // InternalMenuDsl.g:11734:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0__0__Impl();
@@ -39027,23 +39458,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0__Impl"
-    // InternalMenuDsl.g:11609:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
+    // InternalMenuDsl.g:11740: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 {
-            // InternalMenuDsl.g:11613:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
-            // InternalMenuDsl.g:11614:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalMenuDsl.g:11744:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
+            // InternalMenuDsl.g:11745:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
             {
-            // InternalMenuDsl.g:11614:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
-            // InternalMenuDsl.g:11615:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalMenuDsl.g:11745:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalMenuDsl.g:11746:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0_0()); 
             }
-            // InternalMenuDsl.g:11616:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
-            // InternalMenuDsl.g:11616:3: rule__XSwitchExpression__Group_2_1_0_0__0
+            // InternalMenuDsl.g:11747:2: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalMenuDsl.g:11747:3: rule__XSwitchExpression__Group_2_1_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__0();
@@ -39078,16 +39509,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0"
-    // InternalMenuDsl.g:11625: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 ;
+    // InternalMenuDsl.g:11756: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 {
-            // InternalMenuDsl.g:11629:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
-            // InternalMenuDsl.g:11630:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
+            // InternalMenuDsl.g:11760:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
+            // InternalMenuDsl.g:11761:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
             {
-            pushFollow(FOLLOW_79);
+            pushFollow(FOLLOW_82);
             rule__XSwitchExpression__Group_2_1_0_0__0__Impl();
 
             state._fsp--;
@@ -39116,23 +39547,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0__Impl"
-    // InternalMenuDsl.g:11637:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
+    // InternalMenuDsl.g:11768: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 {
-            // InternalMenuDsl.g:11641:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
-            // InternalMenuDsl.g:11642:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalMenuDsl.g:11772:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
+            // InternalMenuDsl.g:11773:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
             {
-            // InternalMenuDsl.g:11642:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
-            // InternalMenuDsl.g:11643:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalMenuDsl.g:11773:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalMenuDsl.g:11774:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_1_0_0_0()); 
             }
-            // InternalMenuDsl.g:11644:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
-            // InternalMenuDsl.g:11644:3: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
+            // InternalMenuDsl.g:11775:2: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalMenuDsl.g:11775:3: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0();
@@ -39167,14 +39598,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1"
-    // InternalMenuDsl.g:11652:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
+    // InternalMenuDsl.g:11783: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 {
-            // InternalMenuDsl.g:11656:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
-            // InternalMenuDsl.g:11657:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
+            // InternalMenuDsl.g:11787:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
+            // InternalMenuDsl.g:11788:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1__Impl();
@@ -39200,22 +39631,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1__Impl"
-    // InternalMenuDsl.g:11663:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
+    // InternalMenuDsl.g:11794: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 {
-            // InternalMenuDsl.g:11667:1: ( ( ':' ) )
-            // InternalMenuDsl.g:11668:1: ( ':' )
+            // InternalMenuDsl.g:11798:1: ( ( ':' ) )
+            // InternalMenuDsl.g:11799:1: ( ':' )
             {
-            // InternalMenuDsl.g:11668:1: ( ':' )
-            // InternalMenuDsl.g:11669:2: ':'
+            // InternalMenuDsl.g:11799:1: ( ':' )
+            // InternalMenuDsl.g:11800:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
-            match(input,72,FOLLOW_2); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
@@ -39241,16 +39672,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0"
-    // InternalMenuDsl.g:11679:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
+    // InternalMenuDsl.g:11810: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 {
-            // InternalMenuDsl.g:11683:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
-            // InternalMenuDsl.g:11684:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
+            // InternalMenuDsl.g:11814:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
+            // InternalMenuDsl.g:11815:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
             {
-            pushFollow(FOLLOW_79);
+            pushFollow(FOLLOW_82);
             rule__XSwitchExpression__Group_5__0__Impl();
 
             state._fsp--;
@@ -39279,22 +39710,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0__Impl"
-    // InternalMenuDsl.g:11691:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
+    // InternalMenuDsl.g:11822:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
     public final void rule__XSwitchExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11695:1: ( ( 'default' ) )
-            // InternalMenuDsl.g:11696:1: ( 'default' )
+            // InternalMenuDsl.g:11826:1: ( ( 'default' ) )
+            // InternalMenuDsl.g:11827:1: ( 'default' )
             {
-            // InternalMenuDsl.g:11696:1: ( 'default' )
-            // InternalMenuDsl.g:11697:2: 'default'
+            // InternalMenuDsl.g:11827:1: ( 'default' )
+            // InternalMenuDsl.g:11828:2: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
-            match(input,73,FOLLOW_2); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
@@ -39320,16 +39751,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1"
-    // InternalMenuDsl.g:11706:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
+    // InternalMenuDsl.g:11837: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 {
-            // InternalMenuDsl.g:11710:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
-            // InternalMenuDsl.g:11711:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
+            // InternalMenuDsl.g:11841:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
+            // InternalMenuDsl.g:11842:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XSwitchExpression__Group_5__1__Impl();
 
             state._fsp--;
@@ -39358,22 +39789,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1__Impl"
-    // InternalMenuDsl.g:11718:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
+    // InternalMenuDsl.g:11849:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11722:1: ( ( ':' ) )
-            // InternalMenuDsl.g:11723:1: ( ':' )
+            // InternalMenuDsl.g:11853:1: ( ( ':' ) )
+            // InternalMenuDsl.g:11854:1: ( ':' )
             {
-            // InternalMenuDsl.g:11723:1: ( ':' )
-            // InternalMenuDsl.g:11724:2: ':'
+            // InternalMenuDsl.g:11854:1: ( ':' )
+            // InternalMenuDsl.g:11855:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
-            match(input,72,FOLLOW_2); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
@@ -39399,14 +39830,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2"
-    // InternalMenuDsl.g:11733:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
+    // InternalMenuDsl.g:11864: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 {
-            // InternalMenuDsl.g:11737:1: ( rule__XSwitchExpression__Group_5__2__Impl )
-            // InternalMenuDsl.g:11738:2: rule__XSwitchExpression__Group_5__2__Impl
+            // InternalMenuDsl.g:11868:1: ( rule__XSwitchExpression__Group_5__2__Impl )
+            // InternalMenuDsl.g:11869:2: rule__XSwitchExpression__Group_5__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2__Impl();
@@ -39432,23 +39863,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2__Impl"
-    // InternalMenuDsl.g:11744:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
+    // InternalMenuDsl.g:11875: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 {
-            // InternalMenuDsl.g:11748:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
-            // InternalMenuDsl.g:11749:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalMenuDsl.g:11879:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
+            // InternalMenuDsl.g:11880:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
             {
-            // InternalMenuDsl.g:11749:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
-            // InternalMenuDsl.g:11750:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalMenuDsl.g:11880:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalMenuDsl.g:11881:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultAssignment_5_2()); 
             }
-            // InternalMenuDsl.g:11751:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
-            // InternalMenuDsl.g:11751:3: rule__XSwitchExpression__DefaultAssignment_5_2
+            // InternalMenuDsl.g:11882:2: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalMenuDsl.g:11882:3: rule__XSwitchExpression__DefaultAssignment_5_2
             {
             pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DefaultAssignment_5_2();
@@ -39483,16 +39914,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__0"
-    // InternalMenuDsl.g:11760:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
+    // InternalMenuDsl.g:11891: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 {
-            // InternalMenuDsl.g:11764:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
-            // InternalMenuDsl.g:11765:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
+            // InternalMenuDsl.g:11895:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
+            // InternalMenuDsl.g:11896:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
             {
-            pushFollow(FOLLOW_80);
+            pushFollow(FOLLOW_83);
             rule__XCasePart__Group__0__Impl();
 
             state._fsp--;
@@ -39521,23 +39952,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__0__Impl"
-    // InternalMenuDsl.g:11772:1: rule__XCasePart__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:11903:1: rule__XCasePart__Group__0__Impl : ( () ) ;
     public final void rule__XCasePart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11776:1: ( ( () ) )
-            // InternalMenuDsl.g:11777:1: ( () )
+            // InternalMenuDsl.g:11907:1: ( ( () ) )
+            // InternalMenuDsl.g:11908:1: ( () )
             {
-            // InternalMenuDsl.g:11777:1: ( () )
-            // InternalMenuDsl.g:11778:2: ()
+            // InternalMenuDsl.g:11908:1: ( () )
+            // InternalMenuDsl.g:11909:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getXCasePartAction_0()); 
             }
-            // InternalMenuDsl.g:11779:2: ()
-            // InternalMenuDsl.g:11779:3: 
+            // InternalMenuDsl.g:11910:2: ()
+            // InternalMenuDsl.g:11910:3: 
             {
             }
 
@@ -39562,16 +39993,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__1"
-    // InternalMenuDsl.g:11787:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
+    // InternalMenuDsl.g:11918: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 {
-            // InternalMenuDsl.g:11791:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
-            // InternalMenuDsl.g:11792:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
+            // InternalMenuDsl.g:11922:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
+            // InternalMenuDsl.g:11923:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
             {
-            pushFollow(FOLLOW_80);
+            pushFollow(FOLLOW_83);
             rule__XCasePart__Group__1__Impl();
 
             state._fsp--;
@@ -39600,31 +40031,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__1__Impl"
-    // InternalMenuDsl.g:11799:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
+    // InternalMenuDsl.g:11930:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
     public final void rule__XCasePart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11803:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
-            // InternalMenuDsl.g:11804:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalMenuDsl.g:11934:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
+            // InternalMenuDsl.g:11935:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
             {
-            // InternalMenuDsl.g:11804:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
-            // InternalMenuDsl.g:11805:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalMenuDsl.g:11935:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalMenuDsl.g:11936:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardAssignment_1()); 
             }
-            // InternalMenuDsl.g:11806:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
-            int alt105=2;
-            int LA105_0 = input.LA(1);
+            // InternalMenuDsl.g:11937:2: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            int alt103=2;
+            int LA103_0 = input.LA(1);
 
-            if ( (LA105_0==RULE_ID||LA105_0==31||LA105_0==61) ) {
-                alt105=1;
+            if ( (LA103_0==RULE_ID||LA103_0==31||LA103_0==63) ) {
+                alt103=1;
             }
-            switch (alt105) {
+            switch (alt103) {
                 case 1 :
-                    // InternalMenuDsl.g:11806:3: rule__XCasePart__TypeGuardAssignment_1
+                    // InternalMenuDsl.g:11937:3: rule__XCasePart__TypeGuardAssignment_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XCasePart__TypeGuardAssignment_1();
@@ -39662,16 +40093,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__2"
-    // InternalMenuDsl.g:11814:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
+    // InternalMenuDsl.g:11945: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 {
-            // InternalMenuDsl.g:11818:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
-            // InternalMenuDsl.g:11819:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
+            // InternalMenuDsl.g:11949:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
+            // InternalMenuDsl.g:11950:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
             {
-            pushFollow(FOLLOW_80);
+            pushFollow(FOLLOW_83);
             rule__XCasePart__Group__2__Impl();
 
             state._fsp--;
@@ -39700,31 +40131,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__2__Impl"
-    // InternalMenuDsl.g:11826:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
+    // InternalMenuDsl.g:11957: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 {
-            // InternalMenuDsl.g:11830:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
-            // InternalMenuDsl.g:11831:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalMenuDsl.g:11961:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
+            // InternalMenuDsl.g:11962:1: ( ( rule__XCasePart__Group_2__0 )? )
             {
-            // InternalMenuDsl.g:11831:1: ( ( rule__XCasePart__Group_2__0 )? )
-            // InternalMenuDsl.g:11832:2: ( rule__XCasePart__Group_2__0 )?
+            // InternalMenuDsl.g:11962:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalMenuDsl.g:11963:2: ( rule__XCasePart__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup_2()); 
             }
-            // InternalMenuDsl.g:11833:2: ( rule__XCasePart__Group_2__0 )?
-            int alt106=2;
-            int LA106_0 = input.LA(1);
+            // InternalMenuDsl.g:11964:2: ( rule__XCasePart__Group_2__0 )?
+            int alt104=2;
+            int LA104_0 = input.LA(1);
 
-            if ( (LA106_0==74) ) {
-                alt106=1;
+            if ( (LA104_0==76) ) {
+                alt104=1;
             }
-            switch (alt106) {
+            switch (alt104) {
                 case 1 :
-                    // InternalMenuDsl.g:11833:3: rule__XCasePart__Group_2__0
+                    // InternalMenuDsl.g:11964:3: rule__XCasePart__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_2__0();
@@ -39762,14 +40193,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__3"
-    // InternalMenuDsl.g:11841:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
+    // InternalMenuDsl.g:11972:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
     public final void rule__XCasePart__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11845:1: ( rule__XCasePart__Group__3__Impl )
-            // InternalMenuDsl.g:11846:2: rule__XCasePart__Group__3__Impl
+            // InternalMenuDsl.g:11976:1: ( rule__XCasePart__Group__3__Impl )
+            // InternalMenuDsl.g:11977:2: rule__XCasePart__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3__Impl();
@@ -39795,23 +40226,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group__3__Impl"
-    // InternalMenuDsl.g:11852:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
+    // InternalMenuDsl.g:11983:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
     public final void rule__XCasePart__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11856:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
-            // InternalMenuDsl.g:11857:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalMenuDsl.g:11987:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
+            // InternalMenuDsl.g:11988:1: ( ( rule__XCasePart__Alternatives_3 ) )
             {
-            // InternalMenuDsl.g:11857:1: ( ( rule__XCasePart__Alternatives_3 ) )
-            // InternalMenuDsl.g:11858:2: ( rule__XCasePart__Alternatives_3 )
+            // InternalMenuDsl.g:11988:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalMenuDsl.g:11989:2: ( rule__XCasePart__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getAlternatives_3()); 
             }
-            // InternalMenuDsl.g:11859:2: ( rule__XCasePart__Alternatives_3 )
-            // InternalMenuDsl.g:11859:3: rule__XCasePart__Alternatives_3
+            // InternalMenuDsl.g:11990:2: ( rule__XCasePart__Alternatives_3 )
+            // InternalMenuDsl.g:11990:3: rule__XCasePart__Alternatives_3
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Alternatives_3();
@@ -39846,16 +40277,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0"
-    // InternalMenuDsl.g:11868:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
+    // InternalMenuDsl.g:11999: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 {
-            // InternalMenuDsl.g:11872:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
-            // InternalMenuDsl.g:11873:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
+            // InternalMenuDsl.g:12003:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
+            // InternalMenuDsl.g:12004:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XCasePart__Group_2__0__Impl();
 
             state._fsp--;
@@ -39884,22 +40315,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0__Impl"
-    // InternalMenuDsl.g:11880:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
+    // InternalMenuDsl.g:12011:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
     public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11884:1: ( ( 'case' ) )
-            // InternalMenuDsl.g:11885:1: ( 'case' )
+            // InternalMenuDsl.g:12015:1: ( ( 'case' ) )
+            // InternalMenuDsl.g:12016:1: ( 'case' )
             {
-            // InternalMenuDsl.g:11885:1: ( 'case' )
-            // InternalMenuDsl.g:11886:2: 'case'
+            // InternalMenuDsl.g:12016:1: ( 'case' )
+            // InternalMenuDsl.g:12017:2: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
-            match(input,74,FOLLOW_2); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
@@ -39925,14 +40356,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1"
-    // InternalMenuDsl.g:11895:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
+    // InternalMenuDsl.g:12026: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 {
-            // InternalMenuDsl.g:11899:1: ( rule__XCasePart__Group_2__1__Impl )
-            // InternalMenuDsl.g:11900:2: rule__XCasePart__Group_2__1__Impl
+            // InternalMenuDsl.g:12030:1: ( rule__XCasePart__Group_2__1__Impl )
+            // InternalMenuDsl.g:12031:2: rule__XCasePart__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1__Impl();
@@ -39958,23 +40389,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1__Impl"
-    // InternalMenuDsl.g:11906:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
+    // InternalMenuDsl.g:12037: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 {
-            // InternalMenuDsl.g:11910:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
-            // InternalMenuDsl.g:11911:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalMenuDsl.g:12041:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
+            // InternalMenuDsl.g:12042:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
             {
-            // InternalMenuDsl.g:11911:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
-            // InternalMenuDsl.g:11912:2: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalMenuDsl.g:12042:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalMenuDsl.g:12043:2: ( rule__XCasePart__CaseAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseAssignment_2_1()); 
             }
-            // InternalMenuDsl.g:11913:2: ( rule__XCasePart__CaseAssignment_2_1 )
-            // InternalMenuDsl.g:11913:3: rule__XCasePart__CaseAssignment_2_1
+            // InternalMenuDsl.g:12044:2: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalMenuDsl.g:12044:3: rule__XCasePart__CaseAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__CaseAssignment_2_1();
@@ -40009,16 +40440,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0"
-    // InternalMenuDsl.g:11922:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
+    // InternalMenuDsl.g:12053: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 {
-            // InternalMenuDsl.g:11926:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
-            // InternalMenuDsl.g:11927:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
+            // InternalMenuDsl.g:12057:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
+            // InternalMenuDsl.g:12058:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XCasePart__Group_3_0__0__Impl();
 
             state._fsp--;
@@ -40047,22 +40478,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0__Impl"
-    // InternalMenuDsl.g:11934:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
+    // InternalMenuDsl.g:12065:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
     public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:11938:1: ( ( ':' ) )
-            // InternalMenuDsl.g:11939:1: ( ':' )
+            // InternalMenuDsl.g:12069:1: ( ( ':' ) )
+            // InternalMenuDsl.g:12070:1: ( ':' )
             {
-            // InternalMenuDsl.g:11939:1: ( ':' )
-            // InternalMenuDsl.g:11940:2: ':'
+            // InternalMenuDsl.g:12070:1: ( ':' )
+            // InternalMenuDsl.g:12071:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
-            match(input,72,FOLLOW_2); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
@@ -40088,14 +40519,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1"
-    // InternalMenuDsl.g:11949:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
+    // InternalMenuDsl.g:12080: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 {
-            // InternalMenuDsl.g:11953:1: ( rule__XCasePart__Group_3_0__1__Impl )
-            // InternalMenuDsl.g:11954:2: rule__XCasePart__Group_3_0__1__Impl
+            // InternalMenuDsl.g:12084:1: ( rule__XCasePart__Group_3_0__1__Impl )
+            // InternalMenuDsl.g:12085:2: rule__XCasePart__Group_3_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1__Impl();
@@ -40121,23 +40552,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1__Impl"
-    // InternalMenuDsl.g:11960:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
+    // InternalMenuDsl.g:12091: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 {
-            // InternalMenuDsl.g:11964:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
-            // InternalMenuDsl.g:11965:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalMenuDsl.g:12095:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
+            // InternalMenuDsl.g:12096:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
             {
-            // InternalMenuDsl.g:11965:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
-            // InternalMenuDsl.g:11966:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalMenuDsl.g:12096:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalMenuDsl.g:12097:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenAssignment_3_0_1()); 
             }
-            // InternalMenuDsl.g:11967:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
-            // InternalMenuDsl.g:11967:3: rule__XCasePart__ThenAssignment_3_0_1
+            // InternalMenuDsl.g:12098:2: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalMenuDsl.g:12098:3: rule__XCasePart__ThenAssignment_3_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XCasePart__ThenAssignment_3_0_1();
@@ -40172,16 +40603,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0"
-    // InternalMenuDsl.g:11976:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
+    // InternalMenuDsl.g:12107: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 {
-            // InternalMenuDsl.g:11980:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
-            // InternalMenuDsl.g:11981:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
+            // InternalMenuDsl.g:12111:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
+            // InternalMenuDsl.g:12112:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XForLoopExpression__Group__0__Impl();
 
             state._fsp--;
@@ -40210,23 +40641,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0__Impl"
-    // InternalMenuDsl.g:11988:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
+    // InternalMenuDsl.g:12119: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 {
-            // InternalMenuDsl.g:11992:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
-            // InternalMenuDsl.g:11993:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalMenuDsl.g:12123:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
+            // InternalMenuDsl.g:12124:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
             {
-            // InternalMenuDsl.g:11993:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
-            // InternalMenuDsl.g:11994:2: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalMenuDsl.g:12124:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalMenuDsl.g:12125:2: ( rule__XForLoopExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0()); 
             }
-            // InternalMenuDsl.g:11995:2: ( rule__XForLoopExpression__Group_0__0 )
-            // InternalMenuDsl.g:11995:3: rule__XForLoopExpression__Group_0__0
+            // InternalMenuDsl.g:12126:2: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalMenuDsl.g:12126:3: rule__XForLoopExpression__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0();
@@ -40261,16 +40692,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1"
-    // InternalMenuDsl.g:12003:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
+    // InternalMenuDsl.g:12134: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 {
-            // InternalMenuDsl.g:12007:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
-            // InternalMenuDsl.g:12008:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
+            // InternalMenuDsl.g:12138:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
+            // InternalMenuDsl.g:12139:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XForLoopExpression__Group__1__Impl();
 
             state._fsp--;
@@ -40299,23 +40730,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1__Impl"
-    // InternalMenuDsl.g:12015:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
+    // InternalMenuDsl.g:12146:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
     public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12019:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
-            // InternalMenuDsl.g:12020:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalMenuDsl.g:12150:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
+            // InternalMenuDsl.g:12151:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
             {
-            // InternalMenuDsl.g:12020:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
-            // InternalMenuDsl.g:12021:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalMenuDsl.g:12151:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalMenuDsl.g:12152:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionAssignment_1()); 
             }
-            // InternalMenuDsl.g:12022:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
-            // InternalMenuDsl.g:12022:3: rule__XForLoopExpression__ForExpressionAssignment_1
+            // InternalMenuDsl.g:12153:2: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalMenuDsl.g:12153:3: rule__XForLoopExpression__ForExpressionAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__ForExpressionAssignment_1();
@@ -40350,16 +40781,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2"
-    // InternalMenuDsl.g:12030:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
+    // InternalMenuDsl.g:12161: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 {
-            // InternalMenuDsl.g:12034:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
-            // InternalMenuDsl.g:12035:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
+            // InternalMenuDsl.g:12165:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
+            // InternalMenuDsl.g:12166:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XForLoopExpression__Group__2__Impl();
 
             state._fsp--;
@@ -40388,22 +40819,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2__Impl"
-    // InternalMenuDsl.g:12042:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:12173:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12046:1: ( ( ')' ) )
-            // InternalMenuDsl.g:12047:1: ( ')' )
+            // InternalMenuDsl.g:12177:1: ( ( ')' ) )
+            // InternalMenuDsl.g:12178:1: ( ')' )
             {
-            // InternalMenuDsl.g:12047:1: ( ')' )
-            // InternalMenuDsl.g:12048:2: ')'
+            // InternalMenuDsl.g:12178:1: ( ')' )
+            // InternalMenuDsl.g:12179:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -40429,14 +40860,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3"
-    // InternalMenuDsl.g:12057:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
+    // InternalMenuDsl.g:12188:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
     public final void rule__XForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12061:1: ( rule__XForLoopExpression__Group__3__Impl )
-            // InternalMenuDsl.g:12062:2: rule__XForLoopExpression__Group__3__Impl
+            // InternalMenuDsl.g:12192:1: ( rule__XForLoopExpression__Group__3__Impl )
+            // InternalMenuDsl.g:12193:2: rule__XForLoopExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3__Impl();
@@ -40462,23 +40893,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3__Impl"
-    // InternalMenuDsl.g:12068:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
+    // InternalMenuDsl.g:12199:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
     public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12072:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
-            // InternalMenuDsl.g:12073:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalMenuDsl.g:12203:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
+            // InternalMenuDsl.g:12204:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
             {
-            // InternalMenuDsl.g:12073:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
-            // InternalMenuDsl.g:12074:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalMenuDsl.g:12204:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalMenuDsl.g:12205:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionAssignment_3()); 
             }
-            // InternalMenuDsl.g:12075:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
-            // InternalMenuDsl.g:12075:3: rule__XForLoopExpression__EachExpressionAssignment_3
+            // InternalMenuDsl.g:12206:2: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalMenuDsl.g:12206:3: rule__XForLoopExpression__EachExpressionAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__EachExpressionAssignment_3();
@@ -40513,14 +40944,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0"
-    // InternalMenuDsl.g:12084:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
+    // InternalMenuDsl.g:12215: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 {
-            // InternalMenuDsl.g:12088:1: ( rule__XForLoopExpression__Group_0__0__Impl )
-            // InternalMenuDsl.g:12089:2: rule__XForLoopExpression__Group_0__0__Impl
+            // InternalMenuDsl.g:12219:1: ( rule__XForLoopExpression__Group_0__0__Impl )
+            // InternalMenuDsl.g:12220:2: rule__XForLoopExpression__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0__Impl();
@@ -40546,23 +40977,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0__Impl"
-    // InternalMenuDsl.g:12095:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
+    // InternalMenuDsl.g:12226: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 {
-            // InternalMenuDsl.g:12099:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
-            // InternalMenuDsl.g:12100:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalMenuDsl.g:12230:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
+            // InternalMenuDsl.g:12231:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
             {
-            // InternalMenuDsl.g:12100:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
-            // InternalMenuDsl.g:12101:2: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalMenuDsl.g:12231:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalMenuDsl.g:12232:2: ( rule__XForLoopExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0_0()); 
             }
-            // InternalMenuDsl.g:12102:2: ( rule__XForLoopExpression__Group_0_0__0 )
-            // InternalMenuDsl.g:12102:3: rule__XForLoopExpression__Group_0_0__0
+            // InternalMenuDsl.g:12233:2: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalMenuDsl.g:12233:3: rule__XForLoopExpression__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__0();
@@ -40597,16 +41028,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0"
-    // InternalMenuDsl.g:12111:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
+    // InternalMenuDsl.g:12242: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 {
-            // InternalMenuDsl.g:12115:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
-            // InternalMenuDsl.g:12116:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
+            // InternalMenuDsl.g:12246:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
+            // InternalMenuDsl.g:12247:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_81);
+            pushFollow(FOLLOW_84);
             rule__XForLoopExpression__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -40635,23 +41066,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0__Impl"
-    // InternalMenuDsl.g:12123:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:12254:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12127:1: ( ( () ) )
-            // InternalMenuDsl.g:12128:1: ( () )
+            // InternalMenuDsl.g:12258:1: ( ( () ) )
+            // InternalMenuDsl.g:12259:1: ( () )
             {
-            // InternalMenuDsl.g:12128:1: ( () )
-            // InternalMenuDsl.g:12129:2: ()
+            // InternalMenuDsl.g:12259:1: ( () )
+            // InternalMenuDsl.g:12260:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getXForLoopExpressionAction_0_0_0()); 
             }
-            // InternalMenuDsl.g:12130:2: ()
-            // InternalMenuDsl.g:12130:3: 
+            // InternalMenuDsl.g:12261:2: ()
+            // InternalMenuDsl.g:12261:3: 
             {
             }
 
@@ -40676,16 +41107,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1"
-    // InternalMenuDsl.g:12138:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
+    // InternalMenuDsl.g:12269: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 {
-            // InternalMenuDsl.g:12142:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
-            // InternalMenuDsl.g:12143:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
+            // InternalMenuDsl.g:12273:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
+            // InternalMenuDsl.g:12274:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XForLoopExpression__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -40714,22 +41145,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1__Impl"
-    // InternalMenuDsl.g:12150:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
+    // InternalMenuDsl.g:12281: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 {
-            // InternalMenuDsl.g:12154:1: ( ( 'for' ) )
-            // InternalMenuDsl.g:12155:1: ( 'for' )
+            // InternalMenuDsl.g:12285:1: ( ( 'for' ) )
+            // InternalMenuDsl.g:12286:1: ( 'for' )
             {
-            // InternalMenuDsl.g:12155:1: ( 'for' )
-            // InternalMenuDsl.g:12156:2: 'for'
+            // InternalMenuDsl.g:12286:1: ( 'for' )
+            // InternalMenuDsl.g:12287:2: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
-            match(input,75,FOLLOW_2); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
@@ -40755,16 +41186,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2"
-    // InternalMenuDsl.g:12165:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
+    // InternalMenuDsl.g:12296: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 {
-            // InternalMenuDsl.g:12169:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
-            // InternalMenuDsl.g:12170:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
+            // InternalMenuDsl.g:12300:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
+            // InternalMenuDsl.g:12301:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XForLoopExpression__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -40793,22 +41224,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2__Impl"
-    // InternalMenuDsl.g:12177:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:12308:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12181:1: ( ( '(' ) )
-            // InternalMenuDsl.g:12182:1: ( '(' )
+            // InternalMenuDsl.g:12312:1: ( ( '(' ) )
+            // InternalMenuDsl.g:12313:1: ( '(' )
             {
-            // InternalMenuDsl.g:12182:1: ( '(' )
-            // InternalMenuDsl.g:12183:2: '('
+            // InternalMenuDsl.g:12313:1: ( '(' )
+            // InternalMenuDsl.g:12314:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -40834,16 +41265,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3"
-    // InternalMenuDsl.g:12192:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
+    // InternalMenuDsl.g:12323: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 {
-            // InternalMenuDsl.g:12196:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
-            // InternalMenuDsl.g:12197:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
+            // InternalMenuDsl.g:12327:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
+            // InternalMenuDsl.g:12328:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
             {
-            pushFollow(FOLLOW_79);
+            pushFollow(FOLLOW_82);
             rule__XForLoopExpression__Group_0_0__3__Impl();
 
             state._fsp--;
@@ -40872,23 +41303,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3__Impl"
-    // InternalMenuDsl.g:12204:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
+    // InternalMenuDsl.g:12335: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 {
-            // InternalMenuDsl.g:12208:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
-            // InternalMenuDsl.g:12209:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalMenuDsl.g:12339:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
+            // InternalMenuDsl.g:12340:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
             {
-            // InternalMenuDsl.g:12209:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
-            // InternalMenuDsl.g:12210:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalMenuDsl.g:12340:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalMenuDsl.g:12341:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamAssignment_0_0_3()); 
             }
-            // InternalMenuDsl.g:12211:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
-            // InternalMenuDsl.g:12211:3: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
+            // InternalMenuDsl.g:12342:2: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalMenuDsl.g:12342:3: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__DeclaredParamAssignment_0_0_3();
@@ -40923,14 +41354,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4"
-    // InternalMenuDsl.g:12219:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
+    // InternalMenuDsl.g:12350: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 {
-            // InternalMenuDsl.g:12223:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
-            // InternalMenuDsl.g:12224:2: rule__XForLoopExpression__Group_0_0__4__Impl
+            // InternalMenuDsl.g:12354:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
+            // InternalMenuDsl.g:12355:2: rule__XForLoopExpression__Group_0_0__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4__Impl();
@@ -40956,22 +41387,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4__Impl"
-    // InternalMenuDsl.g:12230:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalMenuDsl.g:12361:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
     public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12234:1: ( ( ':' ) )
-            // InternalMenuDsl.g:12235:1: ( ':' )
+            // InternalMenuDsl.g:12365:1: ( ( ':' ) )
+            // InternalMenuDsl.g:12366:1: ( ':' )
             {
-            // InternalMenuDsl.g:12235:1: ( ':' )
-            // InternalMenuDsl.g:12236:2: ':'
+            // InternalMenuDsl.g:12366:1: ( ':' )
+            // InternalMenuDsl.g:12367:2: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
-            match(input,72,FOLLOW_2); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
@@ -40997,16 +41428,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0"
-    // InternalMenuDsl.g:12246:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
+    // InternalMenuDsl.g:12377: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 {
-            // InternalMenuDsl.g:12250:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
-            // InternalMenuDsl.g:12251:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
+            // InternalMenuDsl.g:12381:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
+            // InternalMenuDsl.g:12382:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_81);
+            pushFollow(FOLLOW_84);
             rule__XBasicForLoopExpression__Group__0__Impl();
 
             state._fsp--;
@@ -41035,23 +41466,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0__Impl"
-    // InternalMenuDsl.g:12258:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:12389:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBasicForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12262:1: ( ( () ) )
-            // InternalMenuDsl.g:12263:1: ( () )
+            // InternalMenuDsl.g:12393:1: ( ( () ) )
+            // InternalMenuDsl.g:12394:1: ( () )
             {
-            // InternalMenuDsl.g:12263:1: ( () )
-            // InternalMenuDsl.g:12264:2: ()
+            // InternalMenuDsl.g:12394:1: ( () )
+            // InternalMenuDsl.g:12395:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getXBasicForLoopExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:12265:2: ()
-            // InternalMenuDsl.g:12265:3: 
+            // InternalMenuDsl.g:12396:2: ()
+            // InternalMenuDsl.g:12396:3: 
             {
             }
 
@@ -41076,16 +41507,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1"
-    // InternalMenuDsl.g:12273:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
+    // InternalMenuDsl.g:12404: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 {
-            // InternalMenuDsl.g:12277:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
-            // InternalMenuDsl.g:12278:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
+            // InternalMenuDsl.g:12408:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
+            // InternalMenuDsl.g:12409:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XBasicForLoopExpression__Group__1__Impl();
 
             state._fsp--;
@@ -41114,22 +41545,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1__Impl"
-    // InternalMenuDsl.g:12285:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
+    // InternalMenuDsl.g:12416:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
     public final void rule__XBasicForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12289:1: ( ( 'for' ) )
-            // InternalMenuDsl.g:12290:1: ( 'for' )
+            // InternalMenuDsl.g:12420:1: ( ( 'for' ) )
+            // InternalMenuDsl.g:12421:1: ( 'for' )
             {
-            // InternalMenuDsl.g:12290:1: ( 'for' )
-            // InternalMenuDsl.g:12291:2: 'for'
+            // InternalMenuDsl.g:12421:1: ( 'for' )
+            // InternalMenuDsl.g:12422:2: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
-            match(input,75,FOLLOW_2); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
@@ -41155,16 +41586,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2"
-    // InternalMenuDsl.g:12300:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
+    // InternalMenuDsl.g:12431: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 {
-            // InternalMenuDsl.g:12304:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
-            // InternalMenuDsl.g:12305:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
+            // InternalMenuDsl.g:12435:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
+            // InternalMenuDsl.g:12436:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_82);
+            pushFollow(FOLLOW_85);
             rule__XBasicForLoopExpression__Group__2__Impl();
 
             state._fsp--;
@@ -41193,22 +41624,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2__Impl"
-    // InternalMenuDsl.g:12312:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:12443:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XBasicForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12316:1: ( ( '(' ) )
-            // InternalMenuDsl.g:12317:1: ( '(' )
+            // InternalMenuDsl.g:12447:1: ( ( '(' ) )
+            // InternalMenuDsl.g:12448:1: ( '(' )
             {
-            // InternalMenuDsl.g:12317:1: ( '(' )
-            // InternalMenuDsl.g:12318:2: '('
+            // InternalMenuDsl.g:12448:1: ( '(' )
+            // InternalMenuDsl.g:12449:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -41234,16 +41665,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3"
-    // InternalMenuDsl.g:12327:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
+    // InternalMenuDsl.g:12458: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 {
-            // InternalMenuDsl.g:12331:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
-            // InternalMenuDsl.g:12332:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
+            // InternalMenuDsl.g:12462:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
+            // InternalMenuDsl.g:12463:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
             {
-            pushFollow(FOLLOW_82);
+            pushFollow(FOLLOW_85);
             rule__XBasicForLoopExpression__Group__3__Impl();
 
             state._fsp--;
@@ -41272,31 +41703,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3__Impl"
-    // InternalMenuDsl.g:12339:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:12470: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 {
-            // InternalMenuDsl.g:12343:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
-            // InternalMenuDsl.g:12344:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalMenuDsl.g:12474:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
+            // InternalMenuDsl.g:12475:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:12344:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
-            // InternalMenuDsl.g:12345:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalMenuDsl.g:12475:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalMenuDsl.g:12476:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:12346:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
-            int alt107=2;
-            int LA107_0 = input.LA(1);
+            // InternalMenuDsl.g:12477:2: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            int alt105=2;
+            int LA105_0 = input.LA(1);
 
-            if ( ((LA107_0>=RULE_STRING && LA107_0<=RULE_DECIMAL)||LA107_0==27||(LA107_0>=34 && LA107_0<=35)||LA107_0==40||(LA107_0>=44 && LA107_0<=50)||LA107_0==52||LA107_0==61||(LA107_0>=65 && LA107_0<=66)||LA107_0==69||LA107_0==71||(LA107_0>=75 && LA107_0<=83)||LA107_0==85||(LA107_0>=104 && LA107_0<=105)) ) {
-                alt107=1;
+            if ( ((LA105_0>=RULE_STRING && LA105_0<=RULE_DECIMAL)||LA105_0==27||(LA105_0>=34 && LA105_0<=35)||LA105_0==40||(LA105_0>=44 && LA105_0<=50)||LA105_0==57||LA105_0==63||(LA105_0>=67 && LA105_0<=68)||LA105_0==71||LA105_0==73||(LA105_0>=77 && LA105_0<=85)||LA105_0==87||(LA105_0>=106 && LA105_0<=107)) ) {
+                alt105=1;
             }
-            switch (alt107) {
+            switch (alt105) {
                 case 1 :
-                    // InternalMenuDsl.g:12346:3: rule__XBasicForLoopExpression__Group_3__0
+                    // InternalMenuDsl.g:12477:3: rule__XBasicForLoopExpression__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_3__0();
@@ -41334,16 +41765,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4"
-    // InternalMenuDsl.g:12354:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
+    // InternalMenuDsl.g:12485: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 {
-            // InternalMenuDsl.g:12358:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
-            // InternalMenuDsl.g:12359:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
+            // InternalMenuDsl.g:12489:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
+            // InternalMenuDsl.g:12490:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
             {
-            pushFollow(FOLLOW_83);
+            pushFollow(FOLLOW_86);
             rule__XBasicForLoopExpression__Group__4__Impl();
 
             state._fsp--;
@@ -41372,22 +41803,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4__Impl"
-    // InternalMenuDsl.g:12366:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
+    // InternalMenuDsl.g:12497:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12370:1: ( ( ';' ) )
-            // InternalMenuDsl.g:12371:1: ( ';' )
+            // InternalMenuDsl.g:12501:1: ( ( ';' ) )
+            // InternalMenuDsl.g:12502:1: ( ';' )
             {
-            // InternalMenuDsl.g:12371:1: ( ';' )
-            // InternalMenuDsl.g:12372:2: ';'
+            // InternalMenuDsl.g:12502:1: ( ';' )
+            // InternalMenuDsl.g:12503:2: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
-            match(input,59,FOLLOW_2); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
@@ -41413,16 +41844,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5"
-    // InternalMenuDsl.g:12381:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
+    // InternalMenuDsl.g:12512: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 {
-            // InternalMenuDsl.g:12385:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
-            // InternalMenuDsl.g:12386:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
+            // InternalMenuDsl.g:12516:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
+            // InternalMenuDsl.g:12517:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
             {
-            pushFollow(FOLLOW_83);
+            pushFollow(FOLLOW_86);
             rule__XBasicForLoopExpression__Group__5__Impl();
 
             state._fsp--;
@@ -41451,31 +41882,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5__Impl"
-    // InternalMenuDsl.g:12393:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
+    // InternalMenuDsl.g:12524:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12397:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
-            // InternalMenuDsl.g:12398:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalMenuDsl.g:12528:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
+            // InternalMenuDsl.g:12529:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
             {
-            // InternalMenuDsl.g:12398:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
-            // InternalMenuDsl.g:12399:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalMenuDsl.g:12529:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalMenuDsl.g:12530:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionAssignment_5()); 
             }
-            // InternalMenuDsl.g:12400:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
-            int alt108=2;
-            int LA108_0 = input.LA(1);
+            // InternalMenuDsl.g:12531:2: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            int alt106=2;
+            int LA106_0 = input.LA(1);
 
-            if ( ((LA108_0>=RULE_STRING && LA108_0<=RULE_DECIMAL)||LA108_0==27||(LA108_0>=34 && LA108_0<=35)||LA108_0==40||(LA108_0>=45 && LA108_0<=50)||LA108_0==52||LA108_0==61||(LA108_0>=65 && LA108_0<=66)||LA108_0==69||LA108_0==71||(LA108_0>=75 && LA108_0<=83)||LA108_0==85||LA108_0==105) ) {
-                alt108=1;
+            if ( ((LA106_0>=RULE_STRING && LA106_0<=RULE_DECIMAL)||LA106_0==27||(LA106_0>=34 && LA106_0<=35)||LA106_0==40||(LA106_0>=45 && LA106_0<=50)||LA106_0==57||LA106_0==63||(LA106_0>=67 && LA106_0<=68)||LA106_0==71||LA106_0==73||(LA106_0>=77 && LA106_0<=85)||LA106_0==87||LA106_0==107) ) {
+                alt106=1;
             }
-            switch (alt108) {
+            switch (alt106) {
                 case 1 :
-                    // InternalMenuDsl.g:12400:3: rule__XBasicForLoopExpression__ExpressionAssignment_5
+                    // InternalMenuDsl.g:12531:3: rule__XBasicForLoopExpression__ExpressionAssignment_5
                     {
                     pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__ExpressionAssignment_5();
@@ -41513,16 +41944,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6"
-    // InternalMenuDsl.g:12408:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
+    // InternalMenuDsl.g:12539: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 {
-            // InternalMenuDsl.g:12412:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
-            // InternalMenuDsl.g:12413:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
+            // InternalMenuDsl.g:12543:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
+            // InternalMenuDsl.g:12544:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
             {
-            pushFollow(FOLLOW_24);
+            pushFollow(FOLLOW_26);
             rule__XBasicForLoopExpression__Group__6__Impl();
 
             state._fsp--;
@@ -41551,22 +41982,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6__Impl"
-    // InternalMenuDsl.g:12420:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
+    // InternalMenuDsl.g:12551:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12424:1: ( ( ';' ) )
-            // InternalMenuDsl.g:12425:1: ( ';' )
+            // InternalMenuDsl.g:12555:1: ( ( ';' ) )
+            // InternalMenuDsl.g:12556:1: ( ';' )
             {
-            // InternalMenuDsl.g:12425:1: ( ';' )
-            // InternalMenuDsl.g:12426:2: ';'
+            // InternalMenuDsl.g:12556:1: ( ';' )
+            // InternalMenuDsl.g:12557:2: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
-            match(input,59,FOLLOW_2); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
@@ -41592,16 +42023,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7"
-    // InternalMenuDsl.g:12435:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
+    // InternalMenuDsl.g:12566: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 {
-            // InternalMenuDsl.g:12439:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
-            // InternalMenuDsl.g:12440:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
+            // InternalMenuDsl.g:12570:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
+            // InternalMenuDsl.g:12571:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
             {
-            pushFollow(FOLLOW_24);
+            pushFollow(FOLLOW_26);
             rule__XBasicForLoopExpression__Group__7__Impl();
 
             state._fsp--;
@@ -41630,31 +42061,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7__Impl"
-    // InternalMenuDsl.g:12447:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
+    // InternalMenuDsl.g:12578: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 {
-            // InternalMenuDsl.g:12451:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
-            // InternalMenuDsl.g:12452:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalMenuDsl.g:12582:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
+            // InternalMenuDsl.g:12583:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
             {
-            // InternalMenuDsl.g:12452:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
-            // InternalMenuDsl.g:12453:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalMenuDsl.g:12583:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalMenuDsl.g:12584:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7()); 
             }
-            // InternalMenuDsl.g:12454:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
-            int alt109=2;
-            int LA109_0 = input.LA(1);
+            // InternalMenuDsl.g:12585:2: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            int alt107=2;
+            int LA107_0 = input.LA(1);
 
-            if ( ((LA109_0>=RULE_STRING && LA109_0<=RULE_DECIMAL)||LA109_0==27||(LA109_0>=34 && LA109_0<=35)||LA109_0==40||(LA109_0>=45 && LA109_0<=50)||LA109_0==52||LA109_0==61||(LA109_0>=65 && LA109_0<=66)||LA109_0==69||LA109_0==71||(LA109_0>=75 && LA109_0<=83)||LA109_0==85||LA109_0==105) ) {
-                alt109=1;
+            if ( ((LA107_0>=RULE_STRING && LA107_0<=RULE_DECIMAL)||LA107_0==27||(LA107_0>=34 && LA107_0<=35)||LA107_0==40||(LA107_0>=45 && LA107_0<=50)||LA107_0==57||LA107_0==63||(LA107_0>=67 && LA107_0<=68)||LA107_0==71||LA107_0==73||(LA107_0>=77 && LA107_0<=85)||LA107_0==87||LA107_0==107) ) {
+                alt107=1;
             }
-            switch (alt109) {
+            switch (alt107) {
                 case 1 :
-                    // InternalMenuDsl.g:12454:3: rule__XBasicForLoopExpression__Group_7__0
+                    // InternalMenuDsl.g:12585:3: rule__XBasicForLoopExpression__Group_7__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_7__0();
@@ -41692,16 +42123,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8"
-    // InternalMenuDsl.g:12462:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
+    // InternalMenuDsl.g:12593: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 {
-            // InternalMenuDsl.g:12466:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
-            // InternalMenuDsl.g:12467:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
+            // InternalMenuDsl.g:12597:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
+            // InternalMenuDsl.g:12598:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XBasicForLoopExpression__Group__8__Impl();
 
             state._fsp--;
@@ -41730,22 +42161,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8__Impl"
-    // InternalMenuDsl.g:12474:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:12605:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
     public final void rule__XBasicForLoopExpression__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12478:1: ( ( ')' ) )
-            // InternalMenuDsl.g:12479:1: ( ')' )
+            // InternalMenuDsl.g:12609:1: ( ( ')' ) )
+            // InternalMenuDsl.g:12610:1: ( ')' )
             {
-            // InternalMenuDsl.g:12479:1: ( ')' )
-            // InternalMenuDsl.g:12480:2: ')'
+            // InternalMenuDsl.g:12610:1: ( ')' )
+            // InternalMenuDsl.g:12611:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
@@ -41771,14 +42202,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9"
-    // InternalMenuDsl.g:12489:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
+    // InternalMenuDsl.g:12620:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
     public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12493:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
-            // InternalMenuDsl.g:12494:2: rule__XBasicForLoopExpression__Group__9__Impl
+            // InternalMenuDsl.g:12624:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
+            // InternalMenuDsl.g:12625:2: rule__XBasicForLoopExpression__Group__9__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9__Impl();
@@ -41804,23 +42235,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9__Impl"
-    // InternalMenuDsl.g:12500:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
+    // InternalMenuDsl.g:12631:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
     public final void rule__XBasicForLoopExpression__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12504:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
-            // InternalMenuDsl.g:12505:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalMenuDsl.g:12635:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
+            // InternalMenuDsl.g:12636:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
             {
-            // InternalMenuDsl.g:12505:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
-            // InternalMenuDsl.g:12506:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalMenuDsl.g:12636:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalMenuDsl.g:12637:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionAssignment_9()); 
             }
-            // InternalMenuDsl.g:12507:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
-            // InternalMenuDsl.g:12507:3: rule__XBasicForLoopExpression__EachExpressionAssignment_9
+            // InternalMenuDsl.g:12638:2: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalMenuDsl.g:12638:3: rule__XBasicForLoopExpression__EachExpressionAssignment_9
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__EachExpressionAssignment_9();
@@ -41855,16 +42286,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0"
-    // InternalMenuDsl.g:12516:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
+    // InternalMenuDsl.g:12647: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 {
-            // InternalMenuDsl.g:12520:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
-            // InternalMenuDsl.g:12521:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
+            // InternalMenuDsl.g:12651:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
+            // InternalMenuDsl.g:12652:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XBasicForLoopExpression__Group_3__0__Impl();
 
             state._fsp--;
@@ -41893,23 +42324,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0__Impl"
-    // InternalMenuDsl.g:12528:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
+    // InternalMenuDsl.g:12659: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 {
-            // InternalMenuDsl.g:12532:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
-            // InternalMenuDsl.g:12533:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalMenuDsl.g:12663:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
+            // InternalMenuDsl.g:12664:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
             {
-            // InternalMenuDsl.g:12533:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
-            // InternalMenuDsl.g:12534:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalMenuDsl.g:12664:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalMenuDsl.g:12665:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_0()); 
             }
-            // InternalMenuDsl.g:12535:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
-            // InternalMenuDsl.g:12535:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
+            // InternalMenuDsl.g:12666:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalMenuDsl.g:12666:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0();
@@ -41944,14 +42375,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1"
-    // InternalMenuDsl.g:12543:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
+    // InternalMenuDsl.g:12674: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 {
-            // InternalMenuDsl.g:12547:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
-            // InternalMenuDsl.g:12548:2: rule__XBasicForLoopExpression__Group_3__1__Impl
+            // InternalMenuDsl.g:12678:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
+            // InternalMenuDsl.g:12679:2: rule__XBasicForLoopExpression__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1__Impl();
@@ -41977,37 +42408,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1__Impl"
-    // InternalMenuDsl.g:12554:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
+    // InternalMenuDsl.g:12685: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 {
-            // InternalMenuDsl.g:12558:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
-            // InternalMenuDsl.g:12559:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalMenuDsl.g:12689:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
+            // InternalMenuDsl.g:12690:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
             {
-            // InternalMenuDsl.g:12559:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
-            // InternalMenuDsl.g:12560:2: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalMenuDsl.g:12690:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalMenuDsl.g:12691:2: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3_1()); 
             }
-            // InternalMenuDsl.g:12561:2: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
-            loop110:
+            // InternalMenuDsl.g:12692:2: ( rule__XBasicForLoopExpression__Group_3_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==63) ) {
-                    alt110=1;
+                if ( (LA108_0==65) ) {
+                    alt108=1;
                 }
 
 
-                switch (alt110) {
+                switch (alt108) {
             	case 1 :
-            	    // InternalMenuDsl.g:12561:3: rule__XBasicForLoopExpression__Group_3_1__0
+            	    // InternalMenuDsl.g:12692:3: rule__XBasicForLoopExpression__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XBasicForLoopExpression__Group_3_1__0();
 
             	    state._fsp--;
@@ -42017,7 +42448,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop110;
+            	    break loop108;
                 }
             } while (true);
 
@@ -42046,16 +42477,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0"
-    // InternalMenuDsl.g:12570:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
+    // InternalMenuDsl.g:12701: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 {
-            // InternalMenuDsl.g:12574:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
-            // InternalMenuDsl.g:12575:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
+            // InternalMenuDsl.g:12705:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
+            // InternalMenuDsl.g:12706:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_84);
+            pushFollow(FOLLOW_87);
             rule__XBasicForLoopExpression__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -42084,22 +42515,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0__Impl"
-    // InternalMenuDsl.g:12582:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:12713:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12586:1: ( ( ',' ) )
-            // InternalMenuDsl.g:12587:1: ( ',' )
+            // InternalMenuDsl.g:12717:1: ( ( ',' ) )
+            // InternalMenuDsl.g:12718:1: ( ',' )
             {
-            // InternalMenuDsl.g:12587:1: ( ',' )
-            // InternalMenuDsl.g:12588:2: ','
+            // InternalMenuDsl.g:12718:1: ( ',' )
+            // InternalMenuDsl.g:12719:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
@@ -42125,14 +42556,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1"
-    // InternalMenuDsl.g:12597:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
+    // InternalMenuDsl.g:12728: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 {
-            // InternalMenuDsl.g:12601:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
-            // InternalMenuDsl.g:12602:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
+            // InternalMenuDsl.g:12732:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
+            // InternalMenuDsl.g:12733:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1__Impl();
@@ -42158,23 +42589,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1__Impl"
-    // InternalMenuDsl.g:12608:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
+    // InternalMenuDsl.g:12739: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 {
-            // InternalMenuDsl.g:12612:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
-            // InternalMenuDsl.g:12613:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:12743:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
+            // InternalMenuDsl.g:12744:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
             {
-            // InternalMenuDsl.g:12613:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
-            // InternalMenuDsl.g:12614:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalMenuDsl.g:12744:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:12745:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_1_1()); 
             }
-            // InternalMenuDsl.g:12615:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
-            // InternalMenuDsl.g:12615:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
+            // InternalMenuDsl.g:12746:2: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalMenuDsl.g:12746:3: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1();
@@ -42209,16 +42640,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0"
-    // InternalMenuDsl.g:12624:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
+    // InternalMenuDsl.g:12755: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 {
-            // InternalMenuDsl.g:12628:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
-            // InternalMenuDsl.g:12629:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
+            // InternalMenuDsl.g:12759:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
+            // InternalMenuDsl.g:12760:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XBasicForLoopExpression__Group_7__0__Impl();
 
             state._fsp--;
@@ -42247,23 +42678,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0__Impl"
-    // InternalMenuDsl.g:12636:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
+    // InternalMenuDsl.g:12767: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 {
-            // InternalMenuDsl.g:12640:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
-            // InternalMenuDsl.g:12641:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalMenuDsl.g:12771:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
+            // InternalMenuDsl.g:12772:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
             {
-            // InternalMenuDsl.g:12641:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
-            // InternalMenuDsl.g:12642:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalMenuDsl.g:12772:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalMenuDsl.g:12773:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_0()); 
             }
-            // InternalMenuDsl.g:12643:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
-            // InternalMenuDsl.g:12643:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
+            // InternalMenuDsl.g:12774:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalMenuDsl.g:12774:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0();
@@ -42298,14 +42729,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1"
-    // InternalMenuDsl.g:12651:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
+    // InternalMenuDsl.g:12782: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 {
-            // InternalMenuDsl.g:12655:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
-            // InternalMenuDsl.g:12656:2: rule__XBasicForLoopExpression__Group_7__1__Impl
+            // InternalMenuDsl.g:12786:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
+            // InternalMenuDsl.g:12787:2: rule__XBasicForLoopExpression__Group_7__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1__Impl();
@@ -42331,37 +42762,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1__Impl"
-    // InternalMenuDsl.g:12662:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
+    // InternalMenuDsl.g:12793: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 {
-            // InternalMenuDsl.g:12666:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
-            // InternalMenuDsl.g:12667:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalMenuDsl.g:12797:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
+            // InternalMenuDsl.g:12798:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
             {
-            // InternalMenuDsl.g:12667:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
-            // InternalMenuDsl.g:12668:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalMenuDsl.g:12798:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalMenuDsl.g:12799:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7_1()); 
             }
-            // InternalMenuDsl.g:12669:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
-            loop111:
+            // InternalMenuDsl.g:12800:2: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            loop109:
             do {
-                int alt111=2;
-                int LA111_0 = input.LA(1);
+                int alt109=2;
+                int LA109_0 = input.LA(1);
 
-                if ( (LA111_0==63) ) {
-                    alt111=1;
+                if ( (LA109_0==65) ) {
+                    alt109=1;
                 }
 
 
-                switch (alt111) {
+                switch (alt109) {
             	case 1 :
-            	    // InternalMenuDsl.g:12669:3: rule__XBasicForLoopExpression__Group_7_1__0
+            	    // InternalMenuDsl.g:12800:3: rule__XBasicForLoopExpression__Group_7_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XBasicForLoopExpression__Group_7_1__0();
 
             	    state._fsp--;
@@ -42371,7 +42802,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop111;
+            	    break loop109;
                 }
             } while (true);
 
@@ -42400,16 +42831,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0"
-    // InternalMenuDsl.g:12678:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
+    // InternalMenuDsl.g:12809: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 {
-            // InternalMenuDsl.g:12682:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
-            // InternalMenuDsl.g:12683:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
+            // InternalMenuDsl.g:12813:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
+            // InternalMenuDsl.g:12814:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XBasicForLoopExpression__Group_7_1__0__Impl();
 
             state._fsp--;
@@ -42438,22 +42869,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0__Impl"
-    // InternalMenuDsl.g:12690:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:12821:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12694:1: ( ( ',' ) )
-            // InternalMenuDsl.g:12695:1: ( ',' )
+            // InternalMenuDsl.g:12825:1: ( ( ',' ) )
+            // InternalMenuDsl.g:12826:1: ( ',' )
             {
-            // InternalMenuDsl.g:12695:1: ( ',' )
-            // InternalMenuDsl.g:12696:2: ','
+            // InternalMenuDsl.g:12826:1: ( ',' )
+            // InternalMenuDsl.g:12827:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
@@ -42479,14 +42910,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1"
-    // InternalMenuDsl.g:12705:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
+    // InternalMenuDsl.g:12836: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 {
-            // InternalMenuDsl.g:12709:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
-            // InternalMenuDsl.g:12710:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
+            // InternalMenuDsl.g:12840:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
+            // InternalMenuDsl.g:12841:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1__Impl();
@@ -42512,23 +42943,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1__Impl"
-    // InternalMenuDsl.g:12716:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
+    // InternalMenuDsl.g:12847: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 {
-            // InternalMenuDsl.g:12720:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
-            // InternalMenuDsl.g:12721:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalMenuDsl.g:12851:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
+            // InternalMenuDsl.g:12852:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
             {
-            // InternalMenuDsl.g:12721:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
-            // InternalMenuDsl.g:12722:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalMenuDsl.g:12852:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalMenuDsl.g:12853:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_1_1()); 
             }
-            // InternalMenuDsl.g:12723:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
-            // InternalMenuDsl.g:12723:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
+            // InternalMenuDsl.g:12854:2: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalMenuDsl.g:12854:3: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1();
@@ -42563,16 +42994,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0"
-    // InternalMenuDsl.g:12732:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
+    // InternalMenuDsl.g:12863: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 {
-            // InternalMenuDsl.g:12736:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
-            // InternalMenuDsl.g:12737:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
+            // InternalMenuDsl.g:12867:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
+            // InternalMenuDsl.g:12868:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_85);
+            pushFollow(FOLLOW_88);
             rule__XWhileExpression__Group__0__Impl();
 
             state._fsp--;
@@ -42601,23 +43032,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0__Impl"
-    // InternalMenuDsl.g:12744:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:12875:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12748:1: ( ( () ) )
-            // InternalMenuDsl.g:12749:1: ( () )
+            // InternalMenuDsl.g:12879:1: ( ( () ) )
+            // InternalMenuDsl.g:12880:1: ( () )
             {
-            // InternalMenuDsl.g:12749:1: ( () )
-            // InternalMenuDsl.g:12750:2: ()
+            // InternalMenuDsl.g:12880:1: ( () )
+            // InternalMenuDsl.g:12881:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getXWhileExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:12751:2: ()
-            // InternalMenuDsl.g:12751:3: 
+            // InternalMenuDsl.g:12882:2: ()
+            // InternalMenuDsl.g:12882:3: 
             {
             }
 
@@ -42642,16 +43073,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1"
-    // InternalMenuDsl.g:12759:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
+    // InternalMenuDsl.g:12890: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 {
-            // InternalMenuDsl.g:12763:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
-            // InternalMenuDsl.g:12764:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
+            // InternalMenuDsl.g:12894:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
+            // InternalMenuDsl.g:12895:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XWhileExpression__Group__1__Impl();
 
             state._fsp--;
@@ -42680,22 +43111,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1__Impl"
-    // InternalMenuDsl.g:12771:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
+    // InternalMenuDsl.g:12902:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
     public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12775:1: ( ( 'while' ) )
-            // InternalMenuDsl.g:12776:1: ( 'while' )
+            // InternalMenuDsl.g:12906:1: ( ( 'while' ) )
+            // InternalMenuDsl.g:12907:1: ( 'while' )
             {
-            // InternalMenuDsl.g:12776:1: ( 'while' )
-            // InternalMenuDsl.g:12777:2: 'while'
+            // InternalMenuDsl.g:12907:1: ( 'while' )
+            // InternalMenuDsl.g:12908:2: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
-            match(input,76,FOLLOW_2); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
@@ -42721,16 +43152,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2"
-    // InternalMenuDsl.g:12786:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
+    // InternalMenuDsl.g:12917: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 {
-            // InternalMenuDsl.g:12790:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
-            // InternalMenuDsl.g:12791:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
+            // InternalMenuDsl.g:12921:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
+            // InternalMenuDsl.g:12922:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XWhileExpression__Group__2__Impl();
 
             state._fsp--;
@@ -42759,22 +43190,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2__Impl"
-    // InternalMenuDsl.g:12798:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:12929:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12802:1: ( ( '(' ) )
-            // InternalMenuDsl.g:12803:1: ( '(' )
+            // InternalMenuDsl.g:12933:1: ( ( '(' ) )
+            // InternalMenuDsl.g:12934:1: ( '(' )
             {
-            // InternalMenuDsl.g:12803:1: ( '(' )
-            // InternalMenuDsl.g:12804:2: '('
+            // InternalMenuDsl.g:12934:1: ( '(' )
+            // InternalMenuDsl.g:12935:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -42800,16 +43231,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3"
-    // InternalMenuDsl.g:12813:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
+    // InternalMenuDsl.g:12944: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 {
-            // InternalMenuDsl.g:12817:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
-            // InternalMenuDsl.g:12818:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
+            // InternalMenuDsl.g:12948:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
+            // InternalMenuDsl.g:12949:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XWhileExpression__Group__3__Impl();
 
             state._fsp--;
@@ -42838,23 +43269,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3__Impl"
-    // InternalMenuDsl.g:12825:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
+    // InternalMenuDsl.g:12956:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
     public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12829:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
-            // InternalMenuDsl.g:12830:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalMenuDsl.g:12960:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
+            // InternalMenuDsl.g:12961:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
             {
-            // InternalMenuDsl.g:12830:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
-            // InternalMenuDsl.g:12831:2: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalMenuDsl.g:12961:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalMenuDsl.g:12962:2: ( rule__XWhileExpression__PredicateAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateAssignment_3()); 
             }
-            // InternalMenuDsl.g:12832:2: ( rule__XWhileExpression__PredicateAssignment_3 )
-            // InternalMenuDsl.g:12832:3: rule__XWhileExpression__PredicateAssignment_3
+            // InternalMenuDsl.g:12963:2: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalMenuDsl.g:12963:3: rule__XWhileExpression__PredicateAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XWhileExpression__PredicateAssignment_3();
@@ -42889,16 +43320,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4"
-    // InternalMenuDsl.g:12840:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
+    // InternalMenuDsl.g:12971: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 {
-            // InternalMenuDsl.g:12844:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
-            // InternalMenuDsl.g:12845:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
+            // InternalMenuDsl.g:12975:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
+            // InternalMenuDsl.g:12976:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XWhileExpression__Group__4__Impl();
 
             state._fsp--;
@@ -42927,22 +43358,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4__Impl"
-    // InternalMenuDsl.g:12852:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:12983:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12856:1: ( ( ')' ) )
-            // InternalMenuDsl.g:12857:1: ( ')' )
+            // InternalMenuDsl.g:12987:1: ( ( ')' ) )
+            // InternalMenuDsl.g:12988:1: ( ')' )
             {
-            // InternalMenuDsl.g:12857:1: ( ')' )
-            // InternalMenuDsl.g:12858:2: ')'
+            // InternalMenuDsl.g:12988:1: ( ')' )
+            // InternalMenuDsl.g:12989:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -42968,14 +43399,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5"
-    // InternalMenuDsl.g:12867:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
+    // InternalMenuDsl.g:12998:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
     public final void rule__XWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12871:1: ( rule__XWhileExpression__Group__5__Impl )
-            // InternalMenuDsl.g:12872:2: rule__XWhileExpression__Group__5__Impl
+            // InternalMenuDsl.g:13002:1: ( rule__XWhileExpression__Group__5__Impl )
+            // InternalMenuDsl.g:13003:2: rule__XWhileExpression__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5__Impl();
@@ -43001,23 +43432,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5__Impl"
-    // InternalMenuDsl.g:12878:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
+    // InternalMenuDsl.g:13009:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
     public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12882:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
-            // InternalMenuDsl.g:12883:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalMenuDsl.g:13013:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
+            // InternalMenuDsl.g:13014:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
             {
-            // InternalMenuDsl.g:12883:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
-            // InternalMenuDsl.g:12884:2: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalMenuDsl.g:13014:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalMenuDsl.g:13015:2: ( rule__XWhileExpression__BodyAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyAssignment_5()); 
             }
-            // InternalMenuDsl.g:12885:2: ( rule__XWhileExpression__BodyAssignment_5 )
-            // InternalMenuDsl.g:12885:3: rule__XWhileExpression__BodyAssignment_5
+            // InternalMenuDsl.g:13016:2: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalMenuDsl.g:13016:3: rule__XWhileExpression__BodyAssignment_5
             {
             pushFollow(FOLLOW_2);
             rule__XWhileExpression__BodyAssignment_5();
@@ -43052,16 +43483,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0"
-    // InternalMenuDsl.g:12894:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
+    // InternalMenuDsl.g:13025: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 {
-            // InternalMenuDsl.g:12898:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
-            // InternalMenuDsl.g:12899:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
+            // InternalMenuDsl.g:13029:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
+            // InternalMenuDsl.g:13030:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_86);
+            pushFollow(FOLLOW_89);
             rule__XDoWhileExpression__Group__0__Impl();
 
             state._fsp--;
@@ -43090,23 +43521,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0__Impl"
-    // InternalMenuDsl.g:12906:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:13037:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12910:1: ( ( () ) )
-            // InternalMenuDsl.g:12911:1: ( () )
+            // InternalMenuDsl.g:13041:1: ( ( () ) )
+            // InternalMenuDsl.g:13042:1: ( () )
             {
-            // InternalMenuDsl.g:12911:1: ( () )
-            // InternalMenuDsl.g:12912:2: ()
+            // InternalMenuDsl.g:13042:1: ( () )
+            // InternalMenuDsl.g:13043:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getXDoWhileExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:12913:2: ()
-            // InternalMenuDsl.g:12913:3: 
+            // InternalMenuDsl.g:13044:2: ()
+            // InternalMenuDsl.g:13044:3: 
             {
             }
 
@@ -43131,16 +43562,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1"
-    // InternalMenuDsl.g:12921:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
+    // InternalMenuDsl.g:13052: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 {
-            // InternalMenuDsl.g:12925:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
-            // InternalMenuDsl.g:12926:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
+            // InternalMenuDsl.g:13056:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
+            // InternalMenuDsl.g:13057:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XDoWhileExpression__Group__1__Impl();
 
             state._fsp--;
@@ -43169,22 +43600,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1__Impl"
-    // InternalMenuDsl.g:12933:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
+    // InternalMenuDsl.g:13064:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
     public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12937:1: ( ( 'do' ) )
-            // InternalMenuDsl.g:12938:1: ( 'do' )
+            // InternalMenuDsl.g:13068:1: ( ( 'do' ) )
+            // InternalMenuDsl.g:13069:1: ( 'do' )
             {
-            // InternalMenuDsl.g:12938:1: ( 'do' )
-            // InternalMenuDsl.g:12939:2: 'do'
+            // InternalMenuDsl.g:13069:1: ( 'do' )
+            // InternalMenuDsl.g:13070:2: 'do'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
-            match(input,77,FOLLOW_2); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
@@ -43210,16 +43641,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2"
-    // InternalMenuDsl.g:12948:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
+    // InternalMenuDsl.g:13079: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 {
-            // InternalMenuDsl.g:12952:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
-            // InternalMenuDsl.g:12953:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
+            // InternalMenuDsl.g:13083:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
+            // InternalMenuDsl.g:13084:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_85);
+            pushFollow(FOLLOW_88);
             rule__XDoWhileExpression__Group__2__Impl();
 
             state._fsp--;
@@ -43248,23 +43679,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2__Impl"
-    // InternalMenuDsl.g:12960:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
+    // InternalMenuDsl.g:13091:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
     public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12964:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
-            // InternalMenuDsl.g:12965:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalMenuDsl.g:13095:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
+            // InternalMenuDsl.g:13096:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
             {
-            // InternalMenuDsl.g:12965:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
-            // InternalMenuDsl.g:12966:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalMenuDsl.g:13096:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalMenuDsl.g:13097:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyAssignment_2()); 
             }
-            // InternalMenuDsl.g:12967:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
-            // InternalMenuDsl.g:12967:3: rule__XDoWhileExpression__BodyAssignment_2
+            // InternalMenuDsl.g:13098:2: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalMenuDsl.g:13098:3: rule__XDoWhileExpression__BodyAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__BodyAssignment_2();
@@ -43299,16 +43730,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3"
-    // InternalMenuDsl.g:12975:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
+    // InternalMenuDsl.g:13106: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 {
-            // InternalMenuDsl.g:12979:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
-            // InternalMenuDsl.g:12980:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
+            // InternalMenuDsl.g:13110:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
+            // InternalMenuDsl.g:13111:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XDoWhileExpression__Group__3__Impl();
 
             state._fsp--;
@@ -43337,22 +43768,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3__Impl"
-    // InternalMenuDsl.g:12987:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
+    // InternalMenuDsl.g:13118:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
     public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:12991:1: ( ( 'while' ) )
-            // InternalMenuDsl.g:12992:1: ( 'while' )
+            // InternalMenuDsl.g:13122:1: ( ( 'while' ) )
+            // InternalMenuDsl.g:13123:1: ( 'while' )
             {
-            // InternalMenuDsl.g:12992:1: ( 'while' )
-            // InternalMenuDsl.g:12993:2: 'while'
+            // InternalMenuDsl.g:13123:1: ( 'while' )
+            // InternalMenuDsl.g:13124:2: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
-            match(input,76,FOLLOW_2); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
@@ -43378,16 +43809,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4"
-    // InternalMenuDsl.g:13002:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
+    // InternalMenuDsl.g:13133: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 {
-            // InternalMenuDsl.g:13006:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
-            // InternalMenuDsl.g:13007:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
+            // InternalMenuDsl.g:13137:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
+            // InternalMenuDsl.g:13138:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XDoWhileExpression__Group__4__Impl();
 
             state._fsp--;
@@ -43416,22 +43847,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4__Impl"
-    // InternalMenuDsl.g:13014:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:13145:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
     public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13018:1: ( ( '(' ) )
-            // InternalMenuDsl.g:13019:1: ( '(' )
+            // InternalMenuDsl.g:13149:1: ( ( '(' ) )
+            // InternalMenuDsl.g:13150:1: ( '(' )
             {
-            // InternalMenuDsl.g:13019:1: ( '(' )
-            // InternalMenuDsl.g:13020:2: '('
+            // InternalMenuDsl.g:13150:1: ( '(' )
+            // InternalMenuDsl.g:13151:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
@@ -43457,16 +43888,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5"
-    // InternalMenuDsl.g:13029:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
+    // InternalMenuDsl.g:13160: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 {
-            // InternalMenuDsl.g:13033:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
-            // InternalMenuDsl.g:13034:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
+            // InternalMenuDsl.g:13164:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
+            // InternalMenuDsl.g:13165:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XDoWhileExpression__Group__5__Impl();
 
             state._fsp--;
@@ -43495,23 +43926,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5__Impl"
-    // InternalMenuDsl.g:13041:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
+    // InternalMenuDsl.g:13172:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
     public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13045:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
-            // InternalMenuDsl.g:13046:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalMenuDsl.g:13176:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
+            // InternalMenuDsl.g:13177:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
             {
-            // InternalMenuDsl.g:13046:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
-            // InternalMenuDsl.g:13047:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalMenuDsl.g:13177:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalMenuDsl.g:13178:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateAssignment_5()); 
             }
-            // InternalMenuDsl.g:13048:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
-            // InternalMenuDsl.g:13048:3: rule__XDoWhileExpression__PredicateAssignment_5
+            // InternalMenuDsl.g:13179:2: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalMenuDsl.g:13179:3: rule__XDoWhileExpression__PredicateAssignment_5
             {
             pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__PredicateAssignment_5();
@@ -43546,14 +43977,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6"
-    // InternalMenuDsl.g:13056:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
+    // InternalMenuDsl.g:13187:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
     public final void rule__XDoWhileExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13060:1: ( rule__XDoWhileExpression__Group__6__Impl )
-            // InternalMenuDsl.g:13061:2: rule__XDoWhileExpression__Group__6__Impl
+            // InternalMenuDsl.g:13191:1: ( rule__XDoWhileExpression__Group__6__Impl )
+            // InternalMenuDsl.g:13192:2: rule__XDoWhileExpression__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6__Impl();
@@ -43579,22 +44010,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6__Impl"
-    // InternalMenuDsl.g:13067:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:13198:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
     public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13071:1: ( ( ')' ) )
-            // InternalMenuDsl.g:13072:1: ( ')' )
+            // InternalMenuDsl.g:13202:1: ( ( ')' ) )
+            // InternalMenuDsl.g:13203:1: ( ')' )
             {
-            // InternalMenuDsl.g:13072:1: ( ')' )
-            // InternalMenuDsl.g:13073:2: ')'
+            // InternalMenuDsl.g:13203:1: ( ')' )
+            // InternalMenuDsl.g:13204:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
@@ -43620,16 +44051,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0"
-    // InternalMenuDsl.g:13083:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
+    // InternalMenuDsl.g:13214: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 {
-            // InternalMenuDsl.g:13087:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
-            // InternalMenuDsl.g:13088:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
+            // InternalMenuDsl.g:13218:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
+            // InternalMenuDsl.g:13219:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
             {
-            pushFollow(FOLLOW_8);
+            pushFollow(FOLLOW_69);
             rule__XBlockExpression__Group__0__Impl();
 
             state._fsp--;
@@ -43658,23 +44089,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0__Impl"
-    // InternalMenuDsl.g:13095:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:13226:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13099:1: ( ( () ) )
-            // InternalMenuDsl.g:13100:1: ( () )
+            // InternalMenuDsl.g:13230:1: ( ( () ) )
+            // InternalMenuDsl.g:13231:1: ( () )
             {
-            // InternalMenuDsl.g:13100:1: ( () )
-            // InternalMenuDsl.g:13101:2: ()
+            // InternalMenuDsl.g:13231:1: ( () )
+            // InternalMenuDsl.g:13232:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getXBlockExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:13102:2: ()
-            // InternalMenuDsl.g:13102:3: 
+            // InternalMenuDsl.g:13233:2: ()
+            // InternalMenuDsl.g:13233:3: 
             {
             }
 
@@ -43699,16 +44130,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1"
-    // InternalMenuDsl.g:13110:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
+    // InternalMenuDsl.g:13241: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 {
-            // InternalMenuDsl.g:13114:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
-            // InternalMenuDsl.g:13115:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
+            // InternalMenuDsl.g:13245:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
+            // InternalMenuDsl.g:13246:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
             {
-            pushFollow(FOLLOW_87);
+            pushFollow(FOLLOW_90);
             rule__XBlockExpression__Group__1__Impl();
 
             state._fsp--;
@@ -43737,22 +44168,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1__Impl"
-    // InternalMenuDsl.g:13122:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
+    // InternalMenuDsl.g:13253:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
     public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13126:1: ( ( '{' ) )
-            // InternalMenuDsl.g:13127:1: ( '{' )
+            // InternalMenuDsl.g:13257:1: ( ( '{' ) )
+            // InternalMenuDsl.g:13258:1: ( '{' )
             {
-            // InternalMenuDsl.g:13127:1: ( '{' )
-            // InternalMenuDsl.g:13128:2: '{'
+            // InternalMenuDsl.g:13258:1: ( '{' )
+            // InternalMenuDsl.g:13259:2: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,52,FOLLOW_2); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -43778,16 +44209,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2"
-    // InternalMenuDsl.g:13137:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
+    // InternalMenuDsl.g:13268: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 {
-            // InternalMenuDsl.g:13141:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
-            // InternalMenuDsl.g:13142:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
+            // InternalMenuDsl.g:13272:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
+            // InternalMenuDsl.g:13273:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
             {
-            pushFollow(FOLLOW_87);
+            pushFollow(FOLLOW_90);
             rule__XBlockExpression__Group__2__Impl();
 
             state._fsp--;
@@ -43816,37 +44247,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2__Impl"
-    // InternalMenuDsl.g:13149:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
+    // InternalMenuDsl.g:13280: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 {
-            // InternalMenuDsl.g:13153:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
-            // InternalMenuDsl.g:13154:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalMenuDsl.g:13284:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
+            // InternalMenuDsl.g:13285:1: ( ( rule__XBlockExpression__Group_2__0 )* )
             {
-            // InternalMenuDsl.g:13154:1: ( ( rule__XBlockExpression__Group_2__0 )* )
-            // InternalMenuDsl.g:13155:2: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalMenuDsl.g:13285:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalMenuDsl.g:13286:2: ( rule__XBlockExpression__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup_2()); 
             }
-            // InternalMenuDsl.g:13156:2: ( rule__XBlockExpression__Group_2__0 )*
-            loop112:
+            // InternalMenuDsl.g:13287:2: ( rule__XBlockExpression__Group_2__0 )*
+            loop110:
             do {
-                int alt112=2;
-                int LA112_0 = input.LA(1);
+                int alt110=2;
+                int LA110_0 = input.LA(1);
 
-                if ( ((LA112_0>=RULE_STRING && LA112_0<=RULE_DECIMAL)||LA112_0==27||(LA112_0>=34 && LA112_0<=35)||LA112_0==40||(LA112_0>=44 && LA112_0<=50)||LA112_0==52||LA112_0==61||(LA112_0>=65 && LA112_0<=66)||LA112_0==69||LA112_0==71||(LA112_0>=75 && LA112_0<=83)||LA112_0==85||(LA112_0>=104 && LA112_0<=105)) ) {
-                    alt112=1;
+                if ( ((LA110_0>=RULE_STRING && LA110_0<=RULE_DECIMAL)||LA110_0==27||(LA110_0>=34 && LA110_0<=35)||LA110_0==40||(LA110_0>=44 && LA110_0<=50)||LA110_0==57||LA110_0==63||(LA110_0>=67 && LA110_0<=68)||LA110_0==71||LA110_0==73||(LA110_0>=77 && LA110_0<=85)||LA110_0==87||(LA110_0>=106 && LA110_0<=107)) ) {
+                    alt110=1;
                 }
 
 
-                switch (alt112) {
+                switch (alt110) {
             	case 1 :
-            	    // InternalMenuDsl.g:13156:3: rule__XBlockExpression__Group_2__0
+            	    // InternalMenuDsl.g:13287:3: rule__XBlockExpression__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_71);
+            	    pushFollow(FOLLOW_74);
             	    rule__XBlockExpression__Group_2__0();
 
             	    state._fsp--;
@@ -43856,7 +44287,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop112;
+            	    break loop110;
                 }
             } while (true);
 
@@ -43885,14 +44316,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3"
-    // InternalMenuDsl.g:13164:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
+    // InternalMenuDsl.g:13295:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
     public final void rule__XBlockExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13168:1: ( rule__XBlockExpression__Group__3__Impl )
-            // InternalMenuDsl.g:13169:2: rule__XBlockExpression__Group__3__Impl
+            // InternalMenuDsl.g:13299:1: ( rule__XBlockExpression__Group__3__Impl )
+            // InternalMenuDsl.g:13300:2: rule__XBlockExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3__Impl();
@@ -43918,22 +44349,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3__Impl"
-    // InternalMenuDsl.g:13175:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
+    // InternalMenuDsl.g:13306:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
     public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13179:1: ( ( '}' ) )
-            // InternalMenuDsl.g:13180:1: ( '}' )
+            // InternalMenuDsl.g:13310:1: ( ( '}' ) )
+            // InternalMenuDsl.g:13311:1: ( '}' )
             {
-            // InternalMenuDsl.g:13180:1: ( '}' )
-            // InternalMenuDsl.g:13181:2: '}'
+            // InternalMenuDsl.g:13311:1: ( '}' )
+            // InternalMenuDsl.g:13312:2: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,55,FOLLOW_2); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -43959,16 +44390,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0"
-    // InternalMenuDsl.g:13191:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
+    // InternalMenuDsl.g:13322: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 {
-            // InternalMenuDsl.g:13195:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
-            // InternalMenuDsl.g:13196:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
+            // InternalMenuDsl.g:13326:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
+            // InternalMenuDsl.g:13327:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_21);
             rule__XBlockExpression__Group_2__0__Impl();
 
             state._fsp--;
@@ -43997,23 +44428,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0__Impl"
-    // InternalMenuDsl.g:13203:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
+    // InternalMenuDsl.g:13334: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 {
-            // InternalMenuDsl.g:13207:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
-            // InternalMenuDsl.g:13208:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalMenuDsl.g:13338:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
+            // InternalMenuDsl.g:13339:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
             {
-            // InternalMenuDsl.g:13208:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
-            // InternalMenuDsl.g:13209:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalMenuDsl.g:13339:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalMenuDsl.g:13340:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsAssignment_2_0()); 
             }
-            // InternalMenuDsl.g:13210:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
-            // InternalMenuDsl.g:13210:3: rule__XBlockExpression__ExpressionsAssignment_2_0
+            // InternalMenuDsl.g:13341:2: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalMenuDsl.g:13341:3: rule__XBlockExpression__ExpressionsAssignment_2_0
             {
             pushFollow(FOLLOW_2);
             rule__XBlockExpression__ExpressionsAssignment_2_0();
@@ -44048,14 +44479,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1"
-    // InternalMenuDsl.g:13218:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
+    // InternalMenuDsl.g:13349: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 {
-            // InternalMenuDsl.g:13222:1: ( rule__XBlockExpression__Group_2__1__Impl )
-            // InternalMenuDsl.g:13223:2: rule__XBlockExpression__Group_2__1__Impl
+            // InternalMenuDsl.g:13353:1: ( rule__XBlockExpression__Group_2__1__Impl )
+            // InternalMenuDsl.g:13354:2: rule__XBlockExpression__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1__Impl();
@@ -44081,33 +44512,33 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1__Impl"
-    // InternalMenuDsl.g:13229:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
+    // InternalMenuDsl.g:13360:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
     public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13233:1: ( ( ( ';' )? ) )
-            // InternalMenuDsl.g:13234:1: ( ( ';' )? )
+            // InternalMenuDsl.g:13364:1: ( ( ( ';' )? ) )
+            // InternalMenuDsl.g:13365:1: ( ( ';' )? )
             {
-            // InternalMenuDsl.g:13234:1: ( ( ';' )? )
-            // InternalMenuDsl.g:13235:2: ( ';' )?
+            // InternalMenuDsl.g:13365:1: ( ( ';' )? )
+            // InternalMenuDsl.g:13366:2: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1()); 
             }
-            // InternalMenuDsl.g:13236:2: ( ';' )?
-            int alt113=2;
-            int LA113_0 = input.LA(1);
+            // InternalMenuDsl.g:13367:2: ( ';' )?
+            int alt111=2;
+            int LA111_0 = input.LA(1);
 
-            if ( (LA113_0==59) ) {
-                alt113=1;
+            if ( (LA111_0==61) ) {
+                alt111=1;
             }
-            switch (alt113) {
+            switch (alt111) {
                 case 1 :
-                    // InternalMenuDsl.g:13236:3: ';'
+                    // InternalMenuDsl.g:13367:3: ';'
                     {
-                    match(input,59,FOLLOW_2); if (state.failed) return ;
+                    match(input,61,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -44139,16 +44570,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0"
-    // InternalMenuDsl.g:13245:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
+    // InternalMenuDsl.g:13376: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 {
-            // InternalMenuDsl.g:13249:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
-            // InternalMenuDsl.g:13250:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
+            // InternalMenuDsl.g:13380:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
+            // InternalMenuDsl.g:13381:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
             {
-            pushFollow(FOLLOW_88);
+            pushFollow(FOLLOW_91);
             rule__XVariableDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -44177,23 +44608,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0__Impl"
-    // InternalMenuDsl.g:13257:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:13388:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XVariableDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13261:1: ( ( () ) )
-            // InternalMenuDsl.g:13262:1: ( () )
+            // InternalMenuDsl.g:13392:1: ( ( () ) )
+            // InternalMenuDsl.g:13393:1: ( () )
             {
-            // InternalMenuDsl.g:13262:1: ( () )
-            // InternalMenuDsl.g:13263:2: ()
+            // InternalMenuDsl.g:13393:1: ( () )
+            // InternalMenuDsl.g:13394:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getXVariableDeclarationAction_0()); 
             }
-            // InternalMenuDsl.g:13264:2: ()
-            // InternalMenuDsl.g:13264:3: 
+            // InternalMenuDsl.g:13395:2: ()
+            // InternalMenuDsl.g:13395:3: 
             {
             }
 
@@ -44218,16 +44649,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1"
-    // InternalMenuDsl.g:13272:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
+    // InternalMenuDsl.g:13403: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 {
-            // InternalMenuDsl.g:13276:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
-            // InternalMenuDsl.g:13277:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
+            // InternalMenuDsl.g:13407:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
+            // InternalMenuDsl.g:13408:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XVariableDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -44256,23 +44687,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1__Impl"
-    // InternalMenuDsl.g:13284:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
+    // InternalMenuDsl.g:13415:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
     public final void rule__XVariableDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13288:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
-            // InternalMenuDsl.g:13289:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalMenuDsl.g:13419:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
+            // InternalMenuDsl.g:13420:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
             {
-            // InternalMenuDsl.g:13289:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
-            // InternalMenuDsl.g:13290:2: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalMenuDsl.g:13420:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalMenuDsl.g:13421:2: ( rule__XVariableDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_1()); 
             }
-            // InternalMenuDsl.g:13291:2: ( rule__XVariableDeclaration__Alternatives_1 )
-            // InternalMenuDsl.g:13291:3: rule__XVariableDeclaration__Alternatives_1
+            // InternalMenuDsl.g:13422:2: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalMenuDsl.g:13422:3: rule__XVariableDeclaration__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_1();
@@ -44307,16 +44738,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2"
-    // InternalMenuDsl.g:13299:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
+    // InternalMenuDsl.g:13430: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 {
-            // InternalMenuDsl.g:13303:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
-            // InternalMenuDsl.g:13304:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
+            // InternalMenuDsl.g:13434:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
+            // InternalMenuDsl.g:13435:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__XVariableDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -44345,23 +44776,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2__Impl"
-    // InternalMenuDsl.g:13311:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
+    // InternalMenuDsl.g:13442:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
     public final void rule__XVariableDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13315:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
-            // InternalMenuDsl.g:13316:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalMenuDsl.g:13446:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
+            // InternalMenuDsl.g:13447:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
             {
-            // InternalMenuDsl.g:13316:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
-            // InternalMenuDsl.g:13317:2: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalMenuDsl.g:13447:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalMenuDsl.g:13448:2: ( rule__XVariableDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_2()); 
             }
-            // InternalMenuDsl.g:13318:2: ( rule__XVariableDeclaration__Alternatives_2 )
-            // InternalMenuDsl.g:13318:3: rule__XVariableDeclaration__Alternatives_2
+            // InternalMenuDsl.g:13449:2: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalMenuDsl.g:13449:3: rule__XVariableDeclaration__Alternatives_2
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_2();
@@ -44396,14 +44827,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3"
-    // InternalMenuDsl.g:13326:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
+    // InternalMenuDsl.g:13457:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
     public final void rule__XVariableDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13330:1: ( rule__XVariableDeclaration__Group__3__Impl )
-            // InternalMenuDsl.g:13331:2: rule__XVariableDeclaration__Group__3__Impl
+            // InternalMenuDsl.g:13461:1: ( rule__XVariableDeclaration__Group__3__Impl )
+            // InternalMenuDsl.g:13462:2: rule__XVariableDeclaration__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3__Impl();
@@ -44429,31 +44860,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3__Impl"
-    // InternalMenuDsl.g:13337:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:13468: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 {
-            // InternalMenuDsl.g:13341:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
-            // InternalMenuDsl.g:13342:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalMenuDsl.g:13472:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
+            // InternalMenuDsl.g:13473:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:13342:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
-            // InternalMenuDsl.g:13343:2: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalMenuDsl.g:13473:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalMenuDsl.g:13474:2: ( rule__XVariableDeclaration__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:13344:2: ( rule__XVariableDeclaration__Group_3__0 )?
-            int alt114=2;
-            int LA114_0 = input.LA(1);
+            // InternalMenuDsl.g:13475:2: ( rule__XVariableDeclaration__Group_3__0 )?
+            int alt112=2;
+            int LA112_0 = input.LA(1);
 
-            if ( (LA114_0==13) ) {
-                alt114=1;
+            if ( (LA112_0==13) ) {
+                alt112=1;
             }
-            switch (alt114) {
+            switch (alt112) {
                 case 1 :
-                    // InternalMenuDsl.g:13344:3: rule__XVariableDeclaration__Group_3__0
+                    // InternalMenuDsl.g:13475:3: rule__XVariableDeclaration__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_3__0();
@@ -44491,14 +44922,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0"
-    // InternalMenuDsl.g:13353:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
+    // InternalMenuDsl.g:13484: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 {
-            // InternalMenuDsl.g:13357:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
-            // InternalMenuDsl.g:13358:2: rule__XVariableDeclaration__Group_2_0__0__Impl
+            // InternalMenuDsl.g:13488:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
+            // InternalMenuDsl.g:13489:2: rule__XVariableDeclaration__Group_2_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0__0__Impl();
@@ -44524,23 +44955,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0__Impl"
-    // InternalMenuDsl.g:13364:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
+    // InternalMenuDsl.g:13495: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 {
-            // InternalMenuDsl.g:13368:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
-            // InternalMenuDsl.g:13369:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalMenuDsl.g:13499:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
+            // InternalMenuDsl.g:13500:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
             {
-            // InternalMenuDsl.g:13369:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
-            // InternalMenuDsl.g:13370:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalMenuDsl.g:13500:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalMenuDsl.g:13501:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0_0()); 
             }
-            // InternalMenuDsl.g:13371:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
-            // InternalMenuDsl.g:13371:3: rule__XVariableDeclaration__Group_2_0_0__0
+            // InternalMenuDsl.g:13502:2: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalMenuDsl.g:13502:3: rule__XVariableDeclaration__Group_2_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__0();
@@ -44575,16 +45006,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0"
-    // InternalMenuDsl.g:13380:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
+    // InternalMenuDsl.g:13511: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 {
-            // InternalMenuDsl.g:13384:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
-            // InternalMenuDsl.g:13385:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
+            // InternalMenuDsl.g:13515:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
+            // InternalMenuDsl.g:13516:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__XVariableDeclaration__Group_2_0_0__0__Impl();
 
             state._fsp--;
@@ -44613,23 +45044,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0__Impl"
-    // InternalMenuDsl.g:13392:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
+    // InternalMenuDsl.g:13523: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 {
-            // InternalMenuDsl.g:13396:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
-            // InternalMenuDsl.g:13397:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalMenuDsl.g:13527:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
+            // InternalMenuDsl.g:13528:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
             {
-            // InternalMenuDsl.g:13397:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
-            // InternalMenuDsl.g:13398:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalMenuDsl.g:13528:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalMenuDsl.g:13529:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_0()); 
             }
-            // InternalMenuDsl.g:13399:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
-            // InternalMenuDsl.g:13399:3: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
+            // InternalMenuDsl.g:13530:2: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalMenuDsl.g:13530:3: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__TypeAssignment_2_0_0_0();
@@ -44664,14 +45095,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1"
-    // InternalMenuDsl.g:13407:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
+    // InternalMenuDsl.g:13538: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 {
-            // InternalMenuDsl.g:13411:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
-            // InternalMenuDsl.g:13412:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
+            // InternalMenuDsl.g:13542:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
+            // InternalMenuDsl.g:13543:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1__Impl();
@@ -44697,23 +45128,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1__Impl"
-    // InternalMenuDsl.g:13418:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
+    // InternalMenuDsl.g:13549: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 {
-            // InternalMenuDsl.g:13422:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
-            // InternalMenuDsl.g:13423:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalMenuDsl.g:13553:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
+            // InternalMenuDsl.g:13554:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
             {
-            // InternalMenuDsl.g:13423:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
-            // InternalMenuDsl.g:13424:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalMenuDsl.g:13554:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalMenuDsl.g:13555:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_1()); 
             }
-            // InternalMenuDsl.g:13425:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
-            // InternalMenuDsl.g:13425:3: rule__XVariableDeclaration__NameAssignment_2_0_0_1
+            // InternalMenuDsl.g:13556:2: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalMenuDsl.g:13556:3: rule__XVariableDeclaration__NameAssignment_2_0_0_1
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__NameAssignment_2_0_0_1();
@@ -44748,16 +45179,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0"
-    // InternalMenuDsl.g:13434:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
+    // InternalMenuDsl.g:13565: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 {
-            // InternalMenuDsl.g:13438:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
-            // InternalMenuDsl.g:13439:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
+            // InternalMenuDsl.g:13569:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
+            // InternalMenuDsl.g:13570:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XVariableDeclaration__Group_3__0__Impl();
 
             state._fsp--;
@@ -44786,17 +45217,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0__Impl"
-    // InternalMenuDsl.g:13446:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
+    // InternalMenuDsl.g:13577:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
     public final void rule__XVariableDeclaration__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13450:1: ( ( '=' ) )
-            // InternalMenuDsl.g:13451:1: ( '=' )
+            // InternalMenuDsl.g:13581:1: ( ( '=' ) )
+            // InternalMenuDsl.g:13582:1: ( '=' )
             {
-            // InternalMenuDsl.g:13451:1: ( '=' )
-            // InternalMenuDsl.g:13452:2: '='
+            // InternalMenuDsl.g:13582:1: ( '=' )
+            // InternalMenuDsl.g:13583:2: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
@@ -44827,14 +45258,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1"
-    // InternalMenuDsl.g:13461:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
+    // InternalMenuDsl.g:13592: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 {
-            // InternalMenuDsl.g:13465:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
-            // InternalMenuDsl.g:13466:2: rule__XVariableDeclaration__Group_3__1__Impl
+            // InternalMenuDsl.g:13596:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
+            // InternalMenuDsl.g:13597:2: rule__XVariableDeclaration__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1__Impl();
@@ -44860,23 +45291,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1__Impl"
-    // InternalMenuDsl.g:13472:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
+    // InternalMenuDsl.g:13603: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 {
-            // InternalMenuDsl.g:13476:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
-            // InternalMenuDsl.g:13477:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalMenuDsl.g:13607:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
+            // InternalMenuDsl.g:13608:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
             {
-            // InternalMenuDsl.g:13477:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
-            // InternalMenuDsl.g:13478:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalMenuDsl.g:13608:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalMenuDsl.g:13609:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightAssignment_3_1()); 
             }
-            // InternalMenuDsl.g:13479:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
-            // InternalMenuDsl.g:13479:3: rule__XVariableDeclaration__RightAssignment_3_1
+            // InternalMenuDsl.g:13610:2: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalMenuDsl.g:13610:3: rule__XVariableDeclaration__RightAssignment_3_1
             {
             pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__RightAssignment_3_1();
@@ -44911,16 +45342,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0"
-    // InternalMenuDsl.g:13488:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
+    // InternalMenuDsl.g:13619: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 {
-            // InternalMenuDsl.g:13492:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
-            // InternalMenuDsl.g:13493:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
+            // InternalMenuDsl.g:13623:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
+            // InternalMenuDsl.g:13624:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__JvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
@@ -44949,38 +45380,38 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0__Impl"
-    // InternalMenuDsl.g:13500:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
+    // InternalMenuDsl.g:13631:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
     public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13504:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
-            // InternalMenuDsl.g:13505:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalMenuDsl.g:13635:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
+            // InternalMenuDsl.g:13636:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
             {
-            // InternalMenuDsl.g:13505:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
-            // InternalMenuDsl.g:13506:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalMenuDsl.g:13636:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalMenuDsl.g:13637:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // InternalMenuDsl.g:13507:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
-            int alt115=2;
-            int LA115_0 = input.LA(1);
+            // InternalMenuDsl.g:13638:2: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            int alt113=2;
+            int LA113_0 = input.LA(1);
 
-            if ( (LA115_0==RULE_ID) ) {
-                int LA115_1 = input.LA(2);
+            if ( (LA113_0==RULE_ID) ) {
+                int LA113_1 = input.LA(2);
 
-                if ( (LA115_1==RULE_ID||LA115_1==27||LA115_1==43||LA115_1==66) ) {
-                    alt115=1;
+                if ( (LA113_1==RULE_ID||LA113_1==27||LA113_1==43||LA113_1==68) ) {
+                    alt113=1;
                 }
             }
-            else if ( (LA115_0==31||LA115_0==61) ) {
-                alt115=1;
+            else if ( (LA113_0==31||LA113_0==63) ) {
+                alt113=1;
             }
-            switch (alt115) {
+            switch (alt113) {
                 case 1 :
-                    // InternalMenuDsl.g:13507:3: rule__JvmFormalParameter__ParameterTypeAssignment_0
+                    // InternalMenuDsl.g:13638:3: rule__JvmFormalParameter__ParameterTypeAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmFormalParameter__ParameterTypeAssignment_0();
@@ -45018,14 +45449,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1"
-    // InternalMenuDsl.g:13515:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
+    // InternalMenuDsl.g:13646:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
     public final void rule__JvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13519:1: ( rule__JvmFormalParameter__Group__1__Impl )
-            // InternalMenuDsl.g:13520:2: rule__JvmFormalParameter__Group__1__Impl
+            // InternalMenuDsl.g:13650:1: ( rule__JvmFormalParameter__Group__1__Impl )
+            // InternalMenuDsl.g:13651:2: rule__JvmFormalParameter__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1__Impl();
@@ -45051,23 +45482,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1__Impl"
-    // InternalMenuDsl.g:13526:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalMenuDsl.g:13657:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13530:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
-            // InternalMenuDsl.g:13531:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalMenuDsl.g:13661:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalMenuDsl.g:13662:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
             {
-            // InternalMenuDsl.g:13531:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
-            // InternalMenuDsl.g:13532:2: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalMenuDsl.g:13662:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalMenuDsl.g:13663:2: ( rule__JvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // InternalMenuDsl.g:13533:2: ( rule__JvmFormalParameter__NameAssignment_1 )
-            // InternalMenuDsl.g:13533:3: rule__JvmFormalParameter__NameAssignment_1
+            // InternalMenuDsl.g:13664:2: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalMenuDsl.g:13664:3: rule__JvmFormalParameter__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__NameAssignment_1();
@@ -45102,16 +45533,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0"
-    // InternalMenuDsl.g:13542:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
+    // InternalMenuDsl.g:13673: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 {
-            // InternalMenuDsl.g:13546:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
-            // InternalMenuDsl.g:13547:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
+            // InternalMenuDsl.g:13677:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
+            // InternalMenuDsl.g:13678:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__FullJvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
@@ -45140,23 +45571,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0__Impl"
-    // InternalMenuDsl.g:13554:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
+    // InternalMenuDsl.g:13685:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13558:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
-            // InternalMenuDsl.g:13559:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalMenuDsl.g:13689:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
+            // InternalMenuDsl.g:13690:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
             {
-            // InternalMenuDsl.g:13559:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
-            // InternalMenuDsl.g:13560:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalMenuDsl.g:13690:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalMenuDsl.g:13691:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // InternalMenuDsl.g:13561:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
-            // InternalMenuDsl.g:13561:3: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
+            // InternalMenuDsl.g:13692:2: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalMenuDsl.g:13692:3: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__ParameterTypeAssignment_0();
@@ -45191,14 +45622,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1"
-    // InternalMenuDsl.g:13569:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
+    // InternalMenuDsl.g:13700:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
     public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13573:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
-            // InternalMenuDsl.g:13574:2: rule__FullJvmFormalParameter__Group__1__Impl
+            // InternalMenuDsl.g:13704:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
+            // InternalMenuDsl.g:13705:2: rule__FullJvmFormalParameter__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1__Impl();
@@ -45224,23 +45655,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1__Impl"
-    // InternalMenuDsl.g:13580:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalMenuDsl.g:13711:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13584:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
-            // InternalMenuDsl.g:13585:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalMenuDsl.g:13715:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalMenuDsl.g:13716:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
             {
-            // InternalMenuDsl.g:13585:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
-            // InternalMenuDsl.g:13586:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalMenuDsl.g:13716:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalMenuDsl.g:13717:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // InternalMenuDsl.g:13587:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
-            // InternalMenuDsl.g:13587:3: rule__FullJvmFormalParameter__NameAssignment_1
+            // InternalMenuDsl.g:13718:2: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalMenuDsl.g:13718:3: rule__FullJvmFormalParameter__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__NameAssignment_1();
@@ -45275,16 +45706,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0"
-    // InternalMenuDsl.g:13596:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
+    // InternalMenuDsl.g:13727: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 {
-            // InternalMenuDsl.g:13600:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
-            // InternalMenuDsl.g:13601:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
+            // InternalMenuDsl.g:13731:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
+            // InternalMenuDsl.g:13732:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_62);
+            pushFollow(FOLLOW_64);
             rule__XFeatureCall__Group__0__Impl();
 
             state._fsp--;
@@ -45313,23 +45744,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0__Impl"
-    // InternalMenuDsl.g:13608:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:13739:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
     public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13612:1: ( ( () ) )
-            // InternalMenuDsl.g:13613:1: ( () )
+            // InternalMenuDsl.g:13743:1: ( ( () ) )
+            // InternalMenuDsl.g:13744:1: ( () )
             {
-            // InternalMenuDsl.g:13613:1: ( () )
-            // InternalMenuDsl.g:13614:2: ()
+            // InternalMenuDsl.g:13744:1: ( () )
+            // InternalMenuDsl.g:13745:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getXFeatureCallAction_0()); 
             }
-            // InternalMenuDsl.g:13615:2: ()
-            // InternalMenuDsl.g:13615:3: 
+            // InternalMenuDsl.g:13746:2: ()
+            // InternalMenuDsl.g:13746:3: 
             {
             }
 
@@ -45354,16 +45785,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1"
-    // InternalMenuDsl.g:13623:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
+    // InternalMenuDsl.g:13754: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 {
-            // InternalMenuDsl.g:13627:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
-            // InternalMenuDsl.g:13628:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
+            // InternalMenuDsl.g:13758:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
+            // InternalMenuDsl.g:13759:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
             {
-            pushFollow(FOLLOW_62);
+            pushFollow(FOLLOW_64);
             rule__XFeatureCall__Group__1__Impl();
 
             state._fsp--;
@@ -45392,31 +45823,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1__Impl"
-    // InternalMenuDsl.g:13635:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
+    // InternalMenuDsl.g:13766: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 {
-            // InternalMenuDsl.g:13639:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
-            // InternalMenuDsl.g:13640:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalMenuDsl.g:13770:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
+            // InternalMenuDsl.g:13771:1: ( ( rule__XFeatureCall__Group_1__0 )? )
             {
-            // InternalMenuDsl.g:13640:1: ( ( rule__XFeatureCall__Group_1__0 )? )
-            // InternalMenuDsl.g:13641:2: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalMenuDsl.g:13771:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalMenuDsl.g:13772:2: ( rule__XFeatureCall__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:13642:2: ( rule__XFeatureCall__Group_1__0 )?
-            int alt116=2;
-            int LA116_0 = input.LA(1);
+            // InternalMenuDsl.g:13773:2: ( rule__XFeatureCall__Group_1__0 )?
+            int alt114=2;
+            int LA114_0 = input.LA(1);
 
-            if ( (LA116_0==27) ) {
-                alt116=1;
+            if ( (LA114_0==27) ) {
+                alt114=1;
             }
-            switch (alt116) {
+            switch (alt114) {
                 case 1 :
-                    // InternalMenuDsl.g:13642:3: rule__XFeatureCall__Group_1__0
+                    // InternalMenuDsl.g:13773:3: rule__XFeatureCall__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_1__0();
@@ -45454,16 +45885,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2"
-    // InternalMenuDsl.g:13650:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
+    // InternalMenuDsl.g:13781: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 {
-            // InternalMenuDsl.g:13654:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
-            // InternalMenuDsl.g:13655:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
+            // InternalMenuDsl.g:13785:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
+            // InternalMenuDsl.g:13786:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
             {
-            pushFollow(FOLLOW_63);
+            pushFollow(FOLLOW_65);
             rule__XFeatureCall__Group__2__Impl();
 
             state._fsp--;
@@ -45492,23 +45923,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2__Impl"
-    // InternalMenuDsl.g:13662:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
+    // InternalMenuDsl.g:13793:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
     public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13666:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
-            // InternalMenuDsl.g:13667:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalMenuDsl.g:13797:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
+            // InternalMenuDsl.g:13798:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
             {
-            // InternalMenuDsl.g:13667:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
-            // InternalMenuDsl.g:13668:2: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalMenuDsl.g:13798:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalMenuDsl.g:13799:2: ( rule__XFeatureCall__FeatureAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureAssignment_2()); 
             }
-            // InternalMenuDsl.g:13669:2: ( rule__XFeatureCall__FeatureAssignment_2 )
-            // InternalMenuDsl.g:13669:3: rule__XFeatureCall__FeatureAssignment_2
+            // InternalMenuDsl.g:13800:2: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalMenuDsl.g:13800:3: rule__XFeatureCall__FeatureAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureAssignment_2();
@@ -45543,16 +45974,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3"
-    // InternalMenuDsl.g:13677:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
+    // InternalMenuDsl.g:13808: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 {
-            // InternalMenuDsl.g:13681:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
-            // InternalMenuDsl.g:13682:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
+            // InternalMenuDsl.g:13812:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
+            // InternalMenuDsl.g:13813:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
             {
-            pushFollow(FOLLOW_63);
+            pushFollow(FOLLOW_65);
             rule__XFeatureCall__Group__3__Impl();
 
             state._fsp--;
@@ -45581,27 +46012,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3__Impl"
-    // InternalMenuDsl.g:13689:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:13820: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 {
-            // InternalMenuDsl.g:13693:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
-            // InternalMenuDsl.g:13694:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalMenuDsl.g:13824:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
+            // InternalMenuDsl.g:13825:1: ( ( rule__XFeatureCall__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:13694:1: ( ( rule__XFeatureCall__Group_3__0 )? )
-            // InternalMenuDsl.g:13695:2: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalMenuDsl.g:13825:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalMenuDsl.g:13826:2: ( rule__XFeatureCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:13696:2: ( rule__XFeatureCall__Group_3__0 )?
-            int alt117=2;
-            alt117 = dfa117.predict(input);
-            switch (alt117) {
+            // InternalMenuDsl.g:13827:2: ( rule__XFeatureCall__Group_3__0 )?
+            int alt115=2;
+            alt115 = dfa115.predict(input);
+            switch (alt115) {
                 case 1 :
-                    // InternalMenuDsl.g:13696:3: rule__XFeatureCall__Group_3__0
+                    // InternalMenuDsl.g:13827:3: rule__XFeatureCall__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3__0();
@@ -45639,14 +46070,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4"
-    // InternalMenuDsl.g:13704:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
+    // InternalMenuDsl.g:13835:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
     public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13708:1: ( rule__XFeatureCall__Group__4__Impl )
-            // InternalMenuDsl.g:13709:2: rule__XFeatureCall__Group__4__Impl
+            // InternalMenuDsl.g:13839:1: ( rule__XFeatureCall__Group__4__Impl )
+            // InternalMenuDsl.g:13840:2: rule__XFeatureCall__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4__Impl();
@@ -45672,27 +46103,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4__Impl"
-    // InternalMenuDsl.g:13715:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
+    // InternalMenuDsl.g:13846:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
     public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13719:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
-            // InternalMenuDsl.g:13720:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalMenuDsl.g:13850:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
+            // InternalMenuDsl.g:13851:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
             {
-            // InternalMenuDsl.g:13720:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
-            // InternalMenuDsl.g:13721:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalMenuDsl.g:13851:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalMenuDsl.g:13852:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_4()); 
             }
-            // InternalMenuDsl.g:13722:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
-            int alt118=2;
-            alt118 = dfa118.predict(input);
-            switch (alt118) {
+            // InternalMenuDsl.g:13853:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            int alt116=2;
+            alt116 = dfa116.predict(input);
+            switch (alt116) {
                 case 1 :
-                    // InternalMenuDsl.g:13722:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+                    // InternalMenuDsl.g:13853:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
@@ -45730,16 +46161,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0"
-    // InternalMenuDsl.g:13731:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
+    // InternalMenuDsl.g:13862: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 {
-            // InternalMenuDsl.g:13735:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
-            // InternalMenuDsl.g:13736:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
+            // InternalMenuDsl.g:13866:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
+            // InternalMenuDsl.g:13867:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__XFeatureCall__Group_1__0__Impl();
 
             state._fsp--;
@@ -45768,17 +46199,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0__Impl"
-    // InternalMenuDsl.g:13743:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
+    // InternalMenuDsl.g:13874:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
     public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13747:1: ( ( '<' ) )
-            // InternalMenuDsl.g:13748:1: ( '<' )
+            // InternalMenuDsl.g:13878:1: ( ( '<' ) )
+            // InternalMenuDsl.g:13879:1: ( '<' )
             {
-            // InternalMenuDsl.g:13748:1: ( '<' )
-            // InternalMenuDsl.g:13749:2: '<'
+            // InternalMenuDsl.g:13879:1: ( '<' )
+            // InternalMenuDsl.g:13880:2: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
@@ -45809,16 +46240,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1"
-    // InternalMenuDsl.g:13758:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
+    // InternalMenuDsl.g:13889: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 {
-            // InternalMenuDsl.g:13762:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
-            // InternalMenuDsl.g:13763:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
+            // InternalMenuDsl.g:13893:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
+            // InternalMenuDsl.g:13894:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__XFeatureCall__Group_1__1__Impl();
 
             state._fsp--;
@@ -45847,23 +46278,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1__Impl"
-    // InternalMenuDsl.g:13770:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:13901: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 {
-            // InternalMenuDsl.g:13774:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:13775:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalMenuDsl.g:13905:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:13906:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:13775:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
-            // InternalMenuDsl.g:13776:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalMenuDsl.g:13906:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalMenuDsl.g:13907:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:13777:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
-            // InternalMenuDsl.g:13777:3: rule__XFeatureCall__TypeArgumentsAssignment_1_1
+            // InternalMenuDsl.g:13908:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalMenuDsl.g:13908:3: rule__XFeatureCall__TypeArgumentsAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_1();
@@ -45898,16 +46329,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2"
-    // InternalMenuDsl.g:13785:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
+    // InternalMenuDsl.g:13916: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 {
-            // InternalMenuDsl.g:13789:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
-            // InternalMenuDsl.g:13790:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
+            // InternalMenuDsl.g:13920:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
+            // InternalMenuDsl.g:13921:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__XFeatureCall__Group_1__2__Impl();
 
             state._fsp--;
@@ -45936,37 +46367,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2__Impl"
-    // InternalMenuDsl.g:13797:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
+    // InternalMenuDsl.g:13928: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 {
-            // InternalMenuDsl.g:13801:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
-            // InternalMenuDsl.g:13802:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalMenuDsl.g:13932:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
+            // InternalMenuDsl.g:13933:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
             {
-            // InternalMenuDsl.g:13802:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
-            // InternalMenuDsl.g:13803:2: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalMenuDsl.g:13933:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalMenuDsl.g:13934:2: ( rule__XFeatureCall__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1_2()); 
             }
-            // InternalMenuDsl.g:13804:2: ( rule__XFeatureCall__Group_1_2__0 )*
-            loop119:
+            // InternalMenuDsl.g:13935:2: ( rule__XFeatureCall__Group_1_2__0 )*
+            loop117:
             do {
-                int alt119=2;
-                int LA119_0 = input.LA(1);
+                int alt117=2;
+                int LA117_0 = input.LA(1);
 
-                if ( (LA119_0==63) ) {
-                    alt119=1;
+                if ( (LA117_0==65) ) {
+                    alt117=1;
                 }
 
 
-                switch (alt119) {
+                switch (alt117) {
             	case 1 :
-            	    // InternalMenuDsl.g:13804:3: rule__XFeatureCall__Group_1_2__0
+            	    // InternalMenuDsl.g:13935:3: rule__XFeatureCall__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XFeatureCall__Group_1_2__0();
 
             	    state._fsp--;
@@ -45976,7 +46407,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop119;
+            	    break loop117;
                 }
             } while (true);
 
@@ -46005,14 +46436,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3"
-    // InternalMenuDsl.g:13812:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
+    // InternalMenuDsl.g:13943: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 {
-            // InternalMenuDsl.g:13816:1: ( rule__XFeatureCall__Group_1__3__Impl )
-            // InternalMenuDsl.g:13817:2: rule__XFeatureCall__Group_1__3__Impl
+            // InternalMenuDsl.g:13947:1: ( rule__XFeatureCall__Group_1__3__Impl )
+            // InternalMenuDsl.g:13948:2: rule__XFeatureCall__Group_1__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3__Impl();
@@ -46038,17 +46469,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3__Impl"
-    // InternalMenuDsl.g:13823:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:13954:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
     public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13827:1: ( ( '>' ) )
-            // InternalMenuDsl.g:13828:1: ( '>' )
+            // InternalMenuDsl.g:13958:1: ( ( '>' ) )
+            // InternalMenuDsl.g:13959:1: ( '>' )
             {
-            // InternalMenuDsl.g:13828:1: ( '>' )
-            // InternalMenuDsl.g:13829:2: '>'
+            // InternalMenuDsl.g:13959:1: ( '>' )
+            // InternalMenuDsl.g:13960:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
@@ -46079,16 +46510,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0"
-    // InternalMenuDsl.g:13839:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
+    // InternalMenuDsl.g:13970: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 {
-            // InternalMenuDsl.g:13843:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
-            // InternalMenuDsl.g:13844:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
+            // InternalMenuDsl.g:13974:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
+            // InternalMenuDsl.g:13975:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__XFeatureCall__Group_1_2__0__Impl();
 
             state._fsp--;
@@ -46117,22 +46548,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0__Impl"
-    // InternalMenuDsl.g:13851:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:13982:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13855:1: ( ( ',' ) )
-            // InternalMenuDsl.g:13856:1: ( ',' )
+            // InternalMenuDsl.g:13986:1: ( ( ',' ) )
+            // InternalMenuDsl.g:13987:1: ( ',' )
             {
-            // InternalMenuDsl.g:13856:1: ( ',' )
-            // InternalMenuDsl.g:13857:2: ','
+            // InternalMenuDsl.g:13987:1: ( ',' )
+            // InternalMenuDsl.g:13988:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
@@ -46158,14 +46589,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1"
-    // InternalMenuDsl.g:13866:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
+    // InternalMenuDsl.g:13997: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 {
-            // InternalMenuDsl.g:13870:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
-            // InternalMenuDsl.g:13871:2: rule__XFeatureCall__Group_1_2__1__Impl
+            // InternalMenuDsl.g:14001:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
+            // InternalMenuDsl.g:14002:2: rule__XFeatureCall__Group_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1__Impl();
@@ -46191,23 +46622,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1__Impl"
-    // InternalMenuDsl.g:13877:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
+    // InternalMenuDsl.g:14008: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 {
-            // InternalMenuDsl.g:13881:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
-            // InternalMenuDsl.g:13882:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalMenuDsl.g:14012:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
+            // InternalMenuDsl.g:14013:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
             {
-            // InternalMenuDsl.g:13882:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
-            // InternalMenuDsl.g:13883:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalMenuDsl.g:14013:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalMenuDsl.g:14014:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_2_1()); 
             }
-            // InternalMenuDsl.g:13884:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
-            // InternalMenuDsl.g:13884:3: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
+            // InternalMenuDsl.g:14015:2: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalMenuDsl.g:14015:3: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_2_1();
@@ -46242,16 +46673,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0"
-    // InternalMenuDsl.g:13893:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
+    // InternalMenuDsl.g:14024: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 {
-            // InternalMenuDsl.g:13897:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
-            // InternalMenuDsl.g:13898:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
+            // InternalMenuDsl.g:14028:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
+            // InternalMenuDsl.g:14029:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_68);
             rule__XFeatureCall__Group_3__0__Impl();
 
             state._fsp--;
@@ -46280,23 +46711,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0__Impl"
-    // InternalMenuDsl.g:13905:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
+    // InternalMenuDsl.g:14036: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 {
-            // InternalMenuDsl.g:13909:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
-            // InternalMenuDsl.g:13910:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalMenuDsl.g:14040:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
+            // InternalMenuDsl.g:14041:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
             {
-            // InternalMenuDsl.g:13910:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
-            // InternalMenuDsl.g:13911:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalMenuDsl.g:14041:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalMenuDsl.g:14042:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallAssignment_3_0()); 
             }
-            // InternalMenuDsl.g:13912:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
-            // InternalMenuDsl.g:13912:3: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
+            // InternalMenuDsl.g:14043:2: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalMenuDsl.g:14043:3: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__ExplicitOperationCallAssignment_3_0();
@@ -46331,16 +46762,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1"
-    // InternalMenuDsl.g:13920:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
+    // InternalMenuDsl.g:14051: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 {
-            // InternalMenuDsl.g:13924:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
-            // InternalMenuDsl.g:13925:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
+            // InternalMenuDsl.g:14055:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
+            // InternalMenuDsl.g:14056:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_68);
             rule__XFeatureCall__Group_3__1__Impl();
 
             state._fsp--;
@@ -46369,31 +46800,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1__Impl"
-    // InternalMenuDsl.g:13932:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
+    // InternalMenuDsl.g:14063: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 {
-            // InternalMenuDsl.g:13936:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
-            // InternalMenuDsl.g:13937:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalMenuDsl.g:14067:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
+            // InternalMenuDsl.g:14068:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
             {
-            // InternalMenuDsl.g:13937:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
-            // InternalMenuDsl.g:13938:2: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalMenuDsl.g:14068:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalMenuDsl.g:14069:2: ( rule__XFeatureCall__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getAlternatives_3_1()); 
             }
-            // InternalMenuDsl.g:13939:2: ( rule__XFeatureCall__Alternatives_3_1 )?
-            int alt120=2;
-            int LA120_0 = input.LA(1);
+            // InternalMenuDsl.g:14070:2: ( rule__XFeatureCall__Alternatives_3_1 )?
+            int alt118=2;
+            int LA118_0 = input.LA(1);
 
-            if ( ((LA120_0>=RULE_STRING && LA120_0<=RULE_DECIMAL)||LA120_0==27||LA120_0==31||(LA120_0>=34 && LA120_0<=35)||LA120_0==40||(LA120_0>=45 && LA120_0<=50)||LA120_0==52||LA120_0==61||(LA120_0>=65 && LA120_0<=66)||LA120_0==69||LA120_0==71||(LA120_0>=75 && LA120_0<=83)||LA120_0==85||LA120_0==103||LA120_0==105) ) {
-                alt120=1;
+            if ( ((LA118_0>=RULE_STRING && LA118_0<=RULE_DECIMAL)||LA118_0==27||LA118_0==31||(LA118_0>=34 && LA118_0<=35)||LA118_0==40||(LA118_0>=45 && LA118_0<=50)||LA118_0==57||LA118_0==63||(LA118_0>=67 && LA118_0<=68)||LA118_0==71||LA118_0==73||(LA118_0>=77 && LA118_0<=85)||LA118_0==87||LA118_0==105||LA118_0==107) ) {
+                alt118=1;
             }
-            switch (alt120) {
+            switch (alt118) {
                 case 1 :
-                    // InternalMenuDsl.g:13939:3: rule__XFeatureCall__Alternatives_3_1
+                    // InternalMenuDsl.g:14070:3: rule__XFeatureCall__Alternatives_3_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Alternatives_3_1();
@@ -46431,14 +46862,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2"
-    // InternalMenuDsl.g:13947:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
+    // InternalMenuDsl.g:14078: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 {
-            // InternalMenuDsl.g:13951:1: ( rule__XFeatureCall__Group_3__2__Impl )
-            // InternalMenuDsl.g:13952:2: rule__XFeatureCall__Group_3__2__Impl
+            // InternalMenuDsl.g:14082:1: ( rule__XFeatureCall__Group_3__2__Impl )
+            // InternalMenuDsl.g:14083:2: rule__XFeatureCall__Group_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2__Impl();
@@ -46464,22 +46895,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2__Impl"
-    // InternalMenuDsl.g:13958:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:14089:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:13962:1: ( ( ')' ) )
-            // InternalMenuDsl.g:13963:1: ( ')' )
+            // InternalMenuDsl.g:14093:1: ( ( ')' ) )
+            // InternalMenuDsl.g:14094:1: ( ')' )
             {
-            // InternalMenuDsl.g:13963:1: ( ')' )
-            // InternalMenuDsl.g:13964:2: ')'
+            // InternalMenuDsl.g:14094:1: ( ')' )
+            // InternalMenuDsl.g:14095:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -46505,16 +46936,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0"
-    // InternalMenuDsl.g:13974:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
+    // InternalMenuDsl.g:14105: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 {
-            // InternalMenuDsl.g:13978:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
-            // InternalMenuDsl.g:13979:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
+            // InternalMenuDsl.g:14109:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
+            // InternalMenuDsl.g:14110:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XFeatureCall__Group_3_1_1__0__Impl();
 
             state._fsp--;
@@ -46543,23 +46974,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0__Impl"
-    // InternalMenuDsl.g:13986:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
+    // InternalMenuDsl.g:14117: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 {
-            // InternalMenuDsl.g:13990:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
-            // InternalMenuDsl.g:13991:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalMenuDsl.g:14121:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
+            // InternalMenuDsl.g:14122:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
             {
-            // InternalMenuDsl.g:13991:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
-            // InternalMenuDsl.g:13992:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalMenuDsl.g:14122:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalMenuDsl.g:14123:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_0()); 
             }
-            // InternalMenuDsl.g:13993:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
-            // InternalMenuDsl.g:13993:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
+            // InternalMenuDsl.g:14124:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalMenuDsl.g:14124:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0();
@@ -46594,14 +47025,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1"
-    // InternalMenuDsl.g:14001:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
+    // InternalMenuDsl.g:14132: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 {
-            // InternalMenuDsl.g:14005:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
-            // InternalMenuDsl.g:14006:2: rule__XFeatureCall__Group_3_1_1__1__Impl
+            // InternalMenuDsl.g:14136:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
+            // InternalMenuDsl.g:14137:2: rule__XFeatureCall__Group_3_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1__Impl();
@@ -46627,37 +47058,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1__Impl"
-    // InternalMenuDsl.g:14012:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
+    // InternalMenuDsl.g:14143: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 {
-            // InternalMenuDsl.g:14016:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
-            // InternalMenuDsl.g:14017:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalMenuDsl.g:14147:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
+            // InternalMenuDsl.g:14148:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
             {
-            // InternalMenuDsl.g:14017:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
-            // InternalMenuDsl.g:14018:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalMenuDsl.g:14148:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalMenuDsl.g:14149:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1_1()); 
             }
-            // InternalMenuDsl.g:14019:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
-            loop121:
+            // InternalMenuDsl.g:14150:2: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            loop119:
             do {
-                int alt121=2;
-                int LA121_0 = input.LA(1);
+                int alt119=2;
+                int LA119_0 = input.LA(1);
 
-                if ( (LA121_0==63) ) {
-                    alt121=1;
+                if ( (LA119_0==65) ) {
+                    alt119=1;
                 }
 
 
-                switch (alt121) {
+                switch (alt119) {
             	case 1 :
-            	    // InternalMenuDsl.g:14019:3: rule__XFeatureCall__Group_3_1_1_1__0
+            	    // InternalMenuDsl.g:14150:3: rule__XFeatureCall__Group_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XFeatureCall__Group_3_1_1_1__0();
 
             	    state._fsp--;
@@ -46667,7 +47098,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop121;
+            	    break loop119;
                 }
             } while (true);
 
@@ -46696,16 +47127,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0"
-    // InternalMenuDsl.g:14028: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 ;
+    // InternalMenuDsl.g:14159: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 {
-            // InternalMenuDsl.g:14032:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
-            // InternalMenuDsl.g:14033:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
+            // InternalMenuDsl.g:14163:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
+            // InternalMenuDsl.g:14164:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XFeatureCall__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
@@ -46734,22 +47165,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0__Impl"
-    // InternalMenuDsl.g:14040:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:14171: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 {
-            // InternalMenuDsl.g:14044:1: ( ( ',' ) )
-            // InternalMenuDsl.g:14045:1: ( ',' )
+            // InternalMenuDsl.g:14175:1: ( ( ',' ) )
+            // InternalMenuDsl.g:14176:1: ( ',' )
             {
-            // InternalMenuDsl.g:14045:1: ( ',' )
-            // InternalMenuDsl.g:14046:2: ','
+            // InternalMenuDsl.g:14176:1: ( ',' )
+            // InternalMenuDsl.g:14177:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
@@ -46775,14 +47206,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1"
-    // InternalMenuDsl.g:14055:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
+    // InternalMenuDsl.g:14186: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 {
-            // InternalMenuDsl.g:14059:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
-            // InternalMenuDsl.g:14060:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
+            // InternalMenuDsl.g:14190:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
+            // InternalMenuDsl.g:14191:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1__Impl();
@@ -46808,23 +47239,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1__Impl"
-    // InternalMenuDsl.g:14066:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
+    // InternalMenuDsl.g:14197: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 {
-            // InternalMenuDsl.g:14070:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
-            // InternalMenuDsl.g:14071:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalMenuDsl.g:14201:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
+            // InternalMenuDsl.g:14202:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
             {
-            // InternalMenuDsl.g:14071:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
-            // InternalMenuDsl.g:14072:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalMenuDsl.g:14202:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalMenuDsl.g:14203:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_1_1()); 
             }
-            // InternalMenuDsl.g:14073:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
-            // InternalMenuDsl.g:14073:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
+            // InternalMenuDsl.g:14204:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalMenuDsl.g:14204:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1();
@@ -46859,16 +47290,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0"
-    // InternalMenuDsl.g:14082:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
+    // InternalMenuDsl.g:14213: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 {
-            // InternalMenuDsl.g:14086:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
-            // InternalMenuDsl.g:14087:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
+            // InternalMenuDsl.g:14217:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
+            // InternalMenuDsl.g:14218:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
             {
-            pushFollow(FOLLOW_89);
+            pushFollow(FOLLOW_92);
             rule__XConstructorCall__Group__0__Impl();
 
             state._fsp--;
@@ -46897,23 +47328,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0__Impl"
-    // InternalMenuDsl.g:14094:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:14225:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
     public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14098:1: ( ( () ) )
-            // InternalMenuDsl.g:14099:1: ( () )
+            // InternalMenuDsl.g:14229:1: ( ( () ) )
+            // InternalMenuDsl.g:14230:1: ( () )
             {
-            // InternalMenuDsl.g:14099:1: ( () )
-            // InternalMenuDsl.g:14100:2: ()
+            // InternalMenuDsl.g:14230:1: ( () )
+            // InternalMenuDsl.g:14231:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getXConstructorCallAction_0()); 
             }
-            // InternalMenuDsl.g:14101:2: ()
-            // InternalMenuDsl.g:14101:3: 
+            // InternalMenuDsl.g:14232:2: ()
+            // InternalMenuDsl.g:14232:3: 
             {
             }
 
@@ -46938,16 +47369,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1"
-    // InternalMenuDsl.g:14109:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
+    // InternalMenuDsl.g:14240: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 {
-            // InternalMenuDsl.g:14113:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
-            // InternalMenuDsl.g:14114:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
+            // InternalMenuDsl.g:14244:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
+            // InternalMenuDsl.g:14245:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__XConstructorCall__Group__1__Impl();
 
             state._fsp--;
@@ -46976,22 +47407,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1__Impl"
-    // InternalMenuDsl.g:14121:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
+    // InternalMenuDsl.g:14252:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
     public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14125:1: ( ( 'new' ) )
-            // InternalMenuDsl.g:14126:1: ( 'new' )
+            // InternalMenuDsl.g:14256:1: ( ( 'new' ) )
+            // InternalMenuDsl.g:14257:1: ( 'new' )
             {
-            // InternalMenuDsl.g:14126:1: ( 'new' )
-            // InternalMenuDsl.g:14127:2: 'new'
+            // InternalMenuDsl.g:14257:1: ( 'new' )
+            // InternalMenuDsl.g:14258:2: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
-            match(input,78,FOLLOW_2); if (state.failed) return ;
+            match(input,80,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
@@ -47017,16 +47448,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2"
-    // InternalMenuDsl.g:14136:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
+    // InternalMenuDsl.g:14267: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 {
-            // InternalMenuDsl.g:14140:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
-            // InternalMenuDsl.g:14141:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
+            // InternalMenuDsl.g:14271:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
+            // InternalMenuDsl.g:14272:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
             {
-            pushFollow(FOLLOW_90);
+            pushFollow(FOLLOW_93);
             rule__XConstructorCall__Group__2__Impl();
 
             state._fsp--;
@@ -47055,23 +47486,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2__Impl"
-    // InternalMenuDsl.g:14148:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
+    // InternalMenuDsl.g:14279:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
     public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14152:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
-            // InternalMenuDsl.g:14153:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalMenuDsl.g:14283:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
+            // InternalMenuDsl.g:14284:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
             {
-            // InternalMenuDsl.g:14153:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
-            // InternalMenuDsl.g:14154:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalMenuDsl.g:14284:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalMenuDsl.g:14285:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorAssignment_2()); 
             }
-            // InternalMenuDsl.g:14155:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
-            // InternalMenuDsl.g:14155:3: rule__XConstructorCall__ConstructorAssignment_2
+            // InternalMenuDsl.g:14286:2: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalMenuDsl.g:14286:3: rule__XConstructorCall__ConstructorAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ConstructorAssignment_2();
@@ -47106,16 +47537,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3"
-    // InternalMenuDsl.g:14163:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
+    // InternalMenuDsl.g:14294: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 {
-            // InternalMenuDsl.g:14167:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
-            // InternalMenuDsl.g:14168:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
+            // InternalMenuDsl.g:14298:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
+            // InternalMenuDsl.g:14299:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
             {
-            pushFollow(FOLLOW_90);
+            pushFollow(FOLLOW_93);
             rule__XConstructorCall__Group__3__Impl();
 
             state._fsp--;
@@ -47144,27 +47575,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3__Impl"
-    // InternalMenuDsl.g:14175:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
+    // InternalMenuDsl.g:14306: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 {
-            // InternalMenuDsl.g:14179:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
-            // InternalMenuDsl.g:14180:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalMenuDsl.g:14310:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
+            // InternalMenuDsl.g:14311:1: ( ( rule__XConstructorCall__Group_3__0 )? )
             {
-            // InternalMenuDsl.g:14180:1: ( ( rule__XConstructorCall__Group_3__0 )? )
-            // InternalMenuDsl.g:14181:2: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalMenuDsl.g:14311:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalMenuDsl.g:14312:2: ( rule__XConstructorCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3()); 
             }
-            // InternalMenuDsl.g:14182:2: ( rule__XConstructorCall__Group_3__0 )?
-            int alt122=2;
-            alt122 = dfa122.predict(input);
-            switch (alt122) {
+            // InternalMenuDsl.g:14313:2: ( rule__XConstructorCall__Group_3__0 )?
+            int alt120=2;
+            alt120 = dfa120.predict(input);
+            switch (alt120) {
                 case 1 :
-                    // InternalMenuDsl.g:14182:3: rule__XConstructorCall__Group_3__0
+                    // InternalMenuDsl.g:14313:3: rule__XConstructorCall__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_3__0();
@@ -47202,16 +47633,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4"
-    // InternalMenuDsl.g:14190:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
+    // InternalMenuDsl.g:14321: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 {
-            // InternalMenuDsl.g:14194:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
-            // InternalMenuDsl.g:14195:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
+            // InternalMenuDsl.g:14325:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
+            // InternalMenuDsl.g:14326:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
             {
-            pushFollow(FOLLOW_90);
+            pushFollow(FOLLOW_93);
             rule__XConstructorCall__Group__4__Impl();
 
             state._fsp--;
@@ -47240,27 +47671,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4__Impl"
-    // InternalMenuDsl.g:14202:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
+    // InternalMenuDsl.g:14333: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 {
-            // InternalMenuDsl.g:14206:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
-            // InternalMenuDsl.g:14207:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalMenuDsl.g:14337:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
+            // InternalMenuDsl.g:14338:1: ( ( rule__XConstructorCall__Group_4__0 )? )
             {
-            // InternalMenuDsl.g:14207:1: ( ( rule__XConstructorCall__Group_4__0 )? )
-            // InternalMenuDsl.g:14208:2: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalMenuDsl.g:14338:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalMenuDsl.g:14339:2: ( rule__XConstructorCall__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4()); 
             }
-            // InternalMenuDsl.g:14209:2: ( rule__XConstructorCall__Group_4__0 )?
-            int alt123=2;
-            alt123 = dfa123.predict(input);
-            switch (alt123) {
+            // InternalMenuDsl.g:14340:2: ( rule__XConstructorCall__Group_4__0 )?
+            int alt121=2;
+            alt121 = dfa121.predict(input);
+            switch (alt121) {
                 case 1 :
-                    // InternalMenuDsl.g:14209:3: rule__XConstructorCall__Group_4__0
+                    // InternalMenuDsl.g:14340:3: rule__XConstructorCall__Group_4__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4__0();
@@ -47298,14 +47729,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5"
-    // InternalMenuDsl.g:14217:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
+    // InternalMenuDsl.g:14348:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
     public final void rule__XConstructorCall__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14221:1: ( rule__XConstructorCall__Group__5__Impl )
-            // InternalMenuDsl.g:14222:2: rule__XConstructorCall__Group__5__Impl
+            // InternalMenuDsl.g:14352:1: ( rule__XConstructorCall__Group__5__Impl )
+            // InternalMenuDsl.g:14353:2: rule__XConstructorCall__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5__Impl();
@@ -47331,27 +47762,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5__Impl"
-    // InternalMenuDsl.g:14228:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
+    // InternalMenuDsl.g:14359:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
     public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14232:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
-            // InternalMenuDsl.g:14233:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalMenuDsl.g:14363:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
+            // InternalMenuDsl.g:14364:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
             {
-            // InternalMenuDsl.g:14233:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
-            // InternalMenuDsl.g:14234:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalMenuDsl.g:14364:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalMenuDsl.g:14365:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_5()); 
             }
-            // InternalMenuDsl.g:14235:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
-            int alt124=2;
-            alt124 = dfa124.predict(input);
-            switch (alt124) {
+            // InternalMenuDsl.g:14366:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            int alt122=2;
+            alt122 = dfa122.predict(input);
+            switch (alt122) {
                 case 1 :
-                    // InternalMenuDsl.g:14235:3: rule__XConstructorCall__ArgumentsAssignment_5
+                    // InternalMenuDsl.g:14366:3: rule__XConstructorCall__ArgumentsAssignment_5
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_5();
@@ -47389,16 +47820,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0"
-    // InternalMenuDsl.g:14244:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
+    // InternalMenuDsl.g:14375: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 {
-            // InternalMenuDsl.g:14248:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
-            // InternalMenuDsl.g:14249:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
+            // InternalMenuDsl.g:14379:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
+            // InternalMenuDsl.g:14380:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__XConstructorCall__Group_3__0__Impl();
 
             state._fsp--;
@@ -47427,23 +47858,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0__Impl"
-    // InternalMenuDsl.g:14256:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
+    // InternalMenuDsl.g:14387:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
     public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14260:1: ( ( ( '<' ) ) )
-            // InternalMenuDsl.g:14261:1: ( ( '<' ) )
+            // InternalMenuDsl.g:14391:1: ( ( ( '<' ) ) )
+            // InternalMenuDsl.g:14392:1: ( ( '<' ) )
             {
-            // InternalMenuDsl.g:14261:1: ( ( '<' ) )
-            // InternalMenuDsl.g:14262:2: ( '<' )
+            // InternalMenuDsl.g:14392:1: ( ( '<' ) )
+            // InternalMenuDsl.g:14393:2: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0()); 
             }
-            // InternalMenuDsl.g:14263:2: ( '<' )
-            // InternalMenuDsl.g:14263:3: '<'
+            // InternalMenuDsl.g:14394:2: ( '<' )
+            // InternalMenuDsl.g:14394:3: '<'
             {
             match(input,27,FOLLOW_2); if (state.failed) return ;
 
@@ -47474,16 +47905,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1"
-    // InternalMenuDsl.g:14271:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
+    // InternalMenuDsl.g:14402: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 {
-            // InternalMenuDsl.g:14275:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
-            // InternalMenuDsl.g:14276:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
+            // InternalMenuDsl.g:14406:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
+            // InternalMenuDsl.g:14407:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__XConstructorCall__Group_3__1__Impl();
 
             state._fsp--;
@@ -47512,23 +47943,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1__Impl"
-    // InternalMenuDsl.g:14283:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
+    // InternalMenuDsl.g:14414: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 {
-            // InternalMenuDsl.g:14287:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
-            // InternalMenuDsl.g:14288:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalMenuDsl.g:14418:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
+            // InternalMenuDsl.g:14419:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
             {
-            // InternalMenuDsl.g:14288:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
-            // InternalMenuDsl.g:14289:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalMenuDsl.g:14419:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalMenuDsl.g:14420:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_1()); 
             }
-            // InternalMenuDsl.g:14290:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
-            // InternalMenuDsl.g:14290:3: rule__XConstructorCall__TypeArgumentsAssignment_3_1
+            // InternalMenuDsl.g:14421:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalMenuDsl.g:14421:3: rule__XConstructorCall__TypeArgumentsAssignment_3_1
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_1();
@@ -47563,16 +47994,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2"
-    // InternalMenuDsl.g:14298:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
+    // InternalMenuDsl.g:14429: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 {
-            // InternalMenuDsl.g:14302:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
-            // InternalMenuDsl.g:14303:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
+            // InternalMenuDsl.g:14433:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
+            // InternalMenuDsl.g:14434:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__XConstructorCall__Group_3__2__Impl();
 
             state._fsp--;
@@ -47601,37 +48032,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2__Impl"
-    // InternalMenuDsl.g:14310:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
+    // InternalMenuDsl.g:14441: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 {
-            // InternalMenuDsl.g:14314:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
-            // InternalMenuDsl.g:14315:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalMenuDsl.g:14445:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
+            // InternalMenuDsl.g:14446:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
             {
-            // InternalMenuDsl.g:14315:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
-            // InternalMenuDsl.g:14316:2: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalMenuDsl.g:14446:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalMenuDsl.g:14447:2: ( rule__XConstructorCall__Group_3_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3_2()); 
             }
-            // InternalMenuDsl.g:14317:2: ( rule__XConstructorCall__Group_3_2__0 )*
-            loop125:
+            // InternalMenuDsl.g:14448:2: ( rule__XConstructorCall__Group_3_2__0 )*
+            loop123:
             do {
-                int alt125=2;
-                int LA125_0 = input.LA(1);
+                int alt123=2;
+                int LA123_0 = input.LA(1);
 
-                if ( (LA125_0==63) ) {
-                    alt125=1;
+                if ( (LA123_0==65) ) {
+                    alt123=1;
                 }
 
 
-                switch (alt125) {
+                switch (alt123) {
             	case 1 :
-            	    // InternalMenuDsl.g:14317:3: rule__XConstructorCall__Group_3_2__0
+            	    // InternalMenuDsl.g:14448:3: rule__XConstructorCall__Group_3_2__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XConstructorCall__Group_3_2__0();
 
             	    state._fsp--;
@@ -47641,7 +48072,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop125;
+            	    break loop123;
                 }
             } while (true);
 
@@ -47670,14 +48101,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3"
-    // InternalMenuDsl.g:14325:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
+    // InternalMenuDsl.g:14456: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 {
-            // InternalMenuDsl.g:14329:1: ( rule__XConstructorCall__Group_3__3__Impl )
-            // InternalMenuDsl.g:14330:2: rule__XConstructorCall__Group_3__3__Impl
+            // InternalMenuDsl.g:14460:1: ( rule__XConstructorCall__Group_3__3__Impl )
+            // InternalMenuDsl.g:14461:2: rule__XConstructorCall__Group_3__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3__Impl();
@@ -47703,17 +48134,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3__Impl"
-    // InternalMenuDsl.g:14336:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:14467:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
     public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14340:1: ( ( '>' ) )
-            // InternalMenuDsl.g:14341:1: ( '>' )
+            // InternalMenuDsl.g:14471:1: ( ( '>' ) )
+            // InternalMenuDsl.g:14472:1: ( '>' )
             {
-            // InternalMenuDsl.g:14341:1: ( '>' )
-            // InternalMenuDsl.g:14342:2: '>'
+            // InternalMenuDsl.g:14472:1: ( '>' )
+            // InternalMenuDsl.g:14473:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
@@ -47744,16 +48175,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0"
-    // InternalMenuDsl.g:14352:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
+    // InternalMenuDsl.g:14483: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 {
-            // InternalMenuDsl.g:14356:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
-            // InternalMenuDsl.g:14357:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
+            // InternalMenuDsl.g:14487:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
+            // InternalMenuDsl.g:14488:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__XConstructorCall__Group_3_2__0__Impl();
 
             state._fsp--;
@@ -47782,22 +48213,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0__Impl"
-    // InternalMenuDsl.g:14364:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:14495:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14368:1: ( ( ',' ) )
-            // InternalMenuDsl.g:14369:1: ( ',' )
+            // InternalMenuDsl.g:14499:1: ( ( ',' ) )
+            // InternalMenuDsl.g:14500:1: ( ',' )
             {
-            // InternalMenuDsl.g:14369:1: ( ',' )
-            // InternalMenuDsl.g:14370:2: ','
+            // InternalMenuDsl.g:14500:1: ( ',' )
+            // InternalMenuDsl.g:14501:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
@@ -47823,14 +48254,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1"
-    // InternalMenuDsl.g:14379:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
+    // InternalMenuDsl.g:14510: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 {
-            // InternalMenuDsl.g:14383:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
-            // InternalMenuDsl.g:14384:2: rule__XConstructorCall__Group_3_2__1__Impl
+            // InternalMenuDsl.g:14514:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
+            // InternalMenuDsl.g:14515:2: rule__XConstructorCall__Group_3_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1__Impl();
@@ -47856,23 +48287,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1__Impl"
-    // InternalMenuDsl.g:14390:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
+    // InternalMenuDsl.g:14521: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 {
-            // InternalMenuDsl.g:14394:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
-            // InternalMenuDsl.g:14395:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalMenuDsl.g:14525:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
+            // InternalMenuDsl.g:14526:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
             {
-            // InternalMenuDsl.g:14395:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
-            // InternalMenuDsl.g:14396:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalMenuDsl.g:14526:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalMenuDsl.g:14527:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_2_1()); 
             }
-            // InternalMenuDsl.g:14397:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
-            // InternalMenuDsl.g:14397:3: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
+            // InternalMenuDsl.g:14528:2: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalMenuDsl.g:14528:3: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_2_1();
@@ -47907,16 +48338,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0"
-    // InternalMenuDsl.g:14406:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
+    // InternalMenuDsl.g:14537: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 {
-            // InternalMenuDsl.g:14410:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
-            // InternalMenuDsl.g:14411:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
+            // InternalMenuDsl.g:14541:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
+            // InternalMenuDsl.g:14542:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_68);
             rule__XConstructorCall__Group_4__0__Impl();
 
             state._fsp--;
@@ -47945,23 +48376,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0__Impl"
-    // InternalMenuDsl.g:14418:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
+    // InternalMenuDsl.g:14549: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 {
-            // InternalMenuDsl.g:14422:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
-            // InternalMenuDsl.g:14423:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalMenuDsl.g:14553:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
+            // InternalMenuDsl.g:14554:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
             {
-            // InternalMenuDsl.g:14423:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
-            // InternalMenuDsl.g:14424:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalMenuDsl.g:14554:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalMenuDsl.g:14555:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallAssignment_4_0()); 
             }
-            // InternalMenuDsl.g:14425:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
-            // InternalMenuDsl.g:14425:3: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
+            // InternalMenuDsl.g:14556:2: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalMenuDsl.g:14556:3: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0();
@@ -47996,16 +48427,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1"
-    // InternalMenuDsl.g:14433:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
+    // InternalMenuDsl.g:14564: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 {
-            // InternalMenuDsl.g:14437:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
-            // InternalMenuDsl.g:14438:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
+            // InternalMenuDsl.g:14568:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
+            // InternalMenuDsl.g:14569:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
             {
-            pushFollow(FOLLOW_66);
+            pushFollow(FOLLOW_68);
             rule__XConstructorCall__Group_4__1__Impl();
 
             state._fsp--;
@@ -48034,31 +48465,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1__Impl"
-    // InternalMenuDsl.g:14445:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
+    // InternalMenuDsl.g:14576: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 {
-            // InternalMenuDsl.g:14449:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
-            // InternalMenuDsl.g:14450:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalMenuDsl.g:14580:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
+            // InternalMenuDsl.g:14581:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
             {
-            // InternalMenuDsl.g:14450:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
-            // InternalMenuDsl.g:14451:2: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalMenuDsl.g:14581:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalMenuDsl.g:14582:2: ( rule__XConstructorCall__Alternatives_4_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getAlternatives_4_1()); 
             }
-            // InternalMenuDsl.g:14452:2: ( rule__XConstructorCall__Alternatives_4_1 )?
-            int alt126=2;
-            int LA126_0 = input.LA(1);
+            // InternalMenuDsl.g:14583:2: ( rule__XConstructorCall__Alternatives_4_1 )?
+            int alt124=2;
+            int LA124_0 = input.LA(1);
 
-            if ( ((LA126_0>=RULE_STRING && LA126_0<=RULE_DECIMAL)||LA126_0==27||LA126_0==31||(LA126_0>=34 && LA126_0<=35)||LA126_0==40||(LA126_0>=45 && LA126_0<=50)||LA126_0==52||LA126_0==61||(LA126_0>=65 && LA126_0<=66)||LA126_0==69||LA126_0==71||(LA126_0>=75 && LA126_0<=83)||LA126_0==85||LA126_0==103||LA126_0==105) ) {
-                alt126=1;
+            if ( ((LA124_0>=RULE_STRING && LA124_0<=RULE_DECIMAL)||LA124_0==27||LA124_0==31||(LA124_0>=34 && LA124_0<=35)||LA124_0==40||(LA124_0>=45 && LA124_0<=50)||LA124_0==57||LA124_0==63||(LA124_0>=67 && LA124_0<=68)||LA124_0==71||LA124_0==73||(LA124_0>=77 && LA124_0<=85)||LA124_0==87||LA124_0==105||LA124_0==107) ) {
+                alt124=1;
             }
-            switch (alt126) {
+            switch (alt124) {
                 case 1 :
-                    // InternalMenuDsl.g:14452:3: rule__XConstructorCall__Alternatives_4_1
+                    // InternalMenuDsl.g:14583:3: rule__XConstructorCall__Alternatives_4_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Alternatives_4_1();
@@ -48096,14 +48527,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2"
-    // InternalMenuDsl.g:14460:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
+    // InternalMenuDsl.g:14591: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 {
-            // InternalMenuDsl.g:14464:1: ( rule__XConstructorCall__Group_4__2__Impl )
-            // InternalMenuDsl.g:14465:2: rule__XConstructorCall__Group_4__2__Impl
+            // InternalMenuDsl.g:14595:1: ( rule__XConstructorCall__Group_4__2__Impl )
+            // InternalMenuDsl.g:14596:2: rule__XConstructorCall__Group_4__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2__Impl();
@@ -48129,22 +48560,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2__Impl"
-    // InternalMenuDsl.g:14471:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:14602:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
     public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14475:1: ( ( ')' ) )
-            // InternalMenuDsl.g:14476:1: ( ')' )
+            // InternalMenuDsl.g:14606:1: ( ( ')' ) )
+            // InternalMenuDsl.g:14607:1: ( ')' )
             {
-            // InternalMenuDsl.g:14476:1: ( ')' )
-            // InternalMenuDsl.g:14477:2: ')'
+            // InternalMenuDsl.g:14607:1: ( ')' )
+            // InternalMenuDsl.g:14608:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
@@ -48170,16 +48601,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0"
-    // InternalMenuDsl.g:14487:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
+    // InternalMenuDsl.g:14618: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 {
-            // InternalMenuDsl.g:14491:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
-            // InternalMenuDsl.g:14492:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
+            // InternalMenuDsl.g:14622:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
+            // InternalMenuDsl.g:14623:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XConstructorCall__Group_4_1_1__0__Impl();
 
             state._fsp--;
@@ -48208,23 +48639,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0__Impl"
-    // InternalMenuDsl.g:14499:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
+    // InternalMenuDsl.g:14630: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 {
-            // InternalMenuDsl.g:14503:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
-            // InternalMenuDsl.g:14504:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalMenuDsl.g:14634:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
+            // InternalMenuDsl.g:14635:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
             {
-            // InternalMenuDsl.g:14504:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
-            // InternalMenuDsl.g:14505:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalMenuDsl.g:14635:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalMenuDsl.g:14636:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_0()); 
             }
-            // InternalMenuDsl.g:14506:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
-            // InternalMenuDsl.g:14506:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
+            // InternalMenuDsl.g:14637:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalMenuDsl.g:14637:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_0();
@@ -48259,14 +48690,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1"
-    // InternalMenuDsl.g:14514:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
+    // InternalMenuDsl.g:14645: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 {
-            // InternalMenuDsl.g:14518:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
-            // InternalMenuDsl.g:14519:2: rule__XConstructorCall__Group_4_1_1__1__Impl
+            // InternalMenuDsl.g:14649:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
+            // InternalMenuDsl.g:14650:2: rule__XConstructorCall__Group_4_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1__Impl();
@@ -48292,37 +48723,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1__Impl"
-    // InternalMenuDsl.g:14525:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
+    // InternalMenuDsl.g:14656: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 {
-            // InternalMenuDsl.g:14529:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
-            // InternalMenuDsl.g:14530:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalMenuDsl.g:14660:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
+            // InternalMenuDsl.g:14661:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
             {
-            // InternalMenuDsl.g:14530:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
-            // InternalMenuDsl.g:14531:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalMenuDsl.g:14661:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalMenuDsl.g:14662:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1_1()); 
             }
-            // InternalMenuDsl.g:14532:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
-            loop127:
+            // InternalMenuDsl.g:14663:2: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            loop125:
             do {
-                int alt127=2;
-                int LA127_0 = input.LA(1);
+                int alt125=2;
+                int LA125_0 = input.LA(1);
 
-                if ( (LA127_0==63) ) {
-                    alt127=1;
+                if ( (LA125_0==65) ) {
+                    alt125=1;
                 }
 
 
-                switch (alt127) {
+                switch (alt125) {
             	case 1 :
-            	    // InternalMenuDsl.g:14532:3: rule__XConstructorCall__Group_4_1_1_1__0
+            	    // InternalMenuDsl.g:14663:3: rule__XConstructorCall__Group_4_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XConstructorCall__Group_4_1_1_1__0();
 
             	    state._fsp--;
@@ -48332,7 +48763,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop127;
+            	    break loop125;
                 }
             } while (true);
 
@@ -48361,16 +48792,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0"
-    // InternalMenuDsl.g:14541: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 ;
+    // InternalMenuDsl.g:14672: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 {
-            // InternalMenuDsl.g:14545:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
-            // InternalMenuDsl.g:14546:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
+            // InternalMenuDsl.g:14676:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
+            // InternalMenuDsl.g:14677:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XConstructorCall__Group_4_1_1_1__0__Impl();
 
             state._fsp--;
@@ -48399,22 +48830,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0__Impl"
-    // InternalMenuDsl.g:14553:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:14684: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 {
-            // InternalMenuDsl.g:14557:1: ( ( ',' ) )
-            // InternalMenuDsl.g:14558:1: ( ',' )
+            // InternalMenuDsl.g:14688:1: ( ( ',' ) )
+            // InternalMenuDsl.g:14689:1: ( ',' )
             {
-            // InternalMenuDsl.g:14558:1: ( ',' )
-            // InternalMenuDsl.g:14559:2: ','
+            // InternalMenuDsl.g:14689:1: ( ',' )
+            // InternalMenuDsl.g:14690:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
@@ -48440,14 +48871,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1"
-    // InternalMenuDsl.g:14568:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
+    // InternalMenuDsl.g:14699: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 {
-            // InternalMenuDsl.g:14572:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
-            // InternalMenuDsl.g:14573:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
+            // InternalMenuDsl.g:14703:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
+            // InternalMenuDsl.g:14704:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1__Impl();
@@ -48473,23 +48904,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1__Impl"
-    // InternalMenuDsl.g:14579:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
+    // InternalMenuDsl.g:14710: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 {
-            // InternalMenuDsl.g:14583:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
-            // InternalMenuDsl.g:14584:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalMenuDsl.g:14714:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
+            // InternalMenuDsl.g:14715:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
             {
-            // InternalMenuDsl.g:14584:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
-            // InternalMenuDsl.g:14585:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalMenuDsl.g:14715:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalMenuDsl.g:14716:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_1_1()); 
             }
-            // InternalMenuDsl.g:14586:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
-            // InternalMenuDsl.g:14586:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
+            // InternalMenuDsl.g:14717:2: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalMenuDsl.g:14717:3: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1();
@@ -48524,16 +48955,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0"
-    // InternalMenuDsl.g:14595:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
+    // InternalMenuDsl.g:14726: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 {
-            // InternalMenuDsl.g:14599:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
-            // InternalMenuDsl.g:14600:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
+            // InternalMenuDsl.g:14730:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
+            // InternalMenuDsl.g:14731:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_91);
+            pushFollow(FOLLOW_94);
             rule__XBooleanLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -48562,23 +48993,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0__Impl"
-    // InternalMenuDsl.g:14607:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:14738:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14611:1: ( ( () ) )
-            // InternalMenuDsl.g:14612:1: ( () )
+            // InternalMenuDsl.g:14742:1: ( ( () ) )
+            // InternalMenuDsl.g:14743:1: ( () )
             {
-            // InternalMenuDsl.g:14612:1: ( () )
-            // InternalMenuDsl.g:14613:2: ()
+            // InternalMenuDsl.g:14743:1: ( () )
+            // InternalMenuDsl.g:14744:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getXBooleanLiteralAction_0()); 
             }
-            // InternalMenuDsl.g:14614:2: ()
-            // InternalMenuDsl.g:14614:3: 
+            // InternalMenuDsl.g:14745:2: ()
+            // InternalMenuDsl.g:14745:3: 
             {
             }
 
@@ -48603,14 +49034,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1"
-    // InternalMenuDsl.g:14622:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
+    // InternalMenuDsl.g:14753:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
     public final void rule__XBooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14626:1: ( rule__XBooleanLiteral__Group__1__Impl )
-            // InternalMenuDsl.g:14627:2: rule__XBooleanLiteral__Group__1__Impl
+            // InternalMenuDsl.g:14757:1: ( rule__XBooleanLiteral__Group__1__Impl )
+            // InternalMenuDsl.g:14758:2: rule__XBooleanLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1__Impl();
@@ -48636,23 +49067,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1__Impl"
-    // InternalMenuDsl.g:14633:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
+    // InternalMenuDsl.g:14764:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14637:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
-            // InternalMenuDsl.g:14638:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalMenuDsl.g:14768:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
+            // InternalMenuDsl.g:14769:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
             {
-            // InternalMenuDsl.g:14638:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
-            // InternalMenuDsl.g:14639:2: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalMenuDsl.g:14769:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalMenuDsl.g:14770:2: ( rule__XBooleanLiteral__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getAlternatives_1()); 
             }
-            // InternalMenuDsl.g:14640:2: ( rule__XBooleanLiteral__Alternatives_1 )
-            // InternalMenuDsl.g:14640:3: rule__XBooleanLiteral__Alternatives_1
+            // InternalMenuDsl.g:14771:2: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalMenuDsl.g:14771:3: rule__XBooleanLiteral__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Alternatives_1();
@@ -48687,16 +49118,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0"
-    // InternalMenuDsl.g:14649:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
+    // InternalMenuDsl.g:14780: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 {
-            // InternalMenuDsl.g:14653:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
-            // InternalMenuDsl.g:14654:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
+            // InternalMenuDsl.g:14784:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
+            // InternalMenuDsl.g:14785:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
             {
-            pushFollow(FOLLOW_92);
+            pushFollow(FOLLOW_95);
             rule__XNullLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -48725,23 +49156,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0__Impl"
-    // InternalMenuDsl.g:14661:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:14792:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14665:1: ( ( () ) )
-            // InternalMenuDsl.g:14666:1: ( () )
+            // InternalMenuDsl.g:14796:1: ( ( () ) )
+            // InternalMenuDsl.g:14797:1: ( () )
             {
-            // InternalMenuDsl.g:14666:1: ( () )
-            // InternalMenuDsl.g:14667:2: ()
+            // InternalMenuDsl.g:14797:1: ( () )
+            // InternalMenuDsl.g:14798:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getXNullLiteralAction_0()); 
             }
-            // InternalMenuDsl.g:14668:2: ()
-            // InternalMenuDsl.g:14668:3: 
+            // InternalMenuDsl.g:14799:2: ()
+            // InternalMenuDsl.g:14799:3: 
             {
             }
 
@@ -48766,14 +49197,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1"
-    // InternalMenuDsl.g:14676:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
+    // InternalMenuDsl.g:14807:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
     public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14680:1: ( rule__XNullLiteral__Group__1__Impl )
-            // InternalMenuDsl.g:14681:2: rule__XNullLiteral__Group__1__Impl
+            // InternalMenuDsl.g:14811:1: ( rule__XNullLiteral__Group__1__Impl )
+            // InternalMenuDsl.g:14812:2: rule__XNullLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1__Impl();
@@ -48799,22 +49230,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1__Impl"
-    // InternalMenuDsl.g:14687:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
+    // InternalMenuDsl.g:14818:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
     public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14691:1: ( ( 'null' ) )
-            // InternalMenuDsl.g:14692:1: ( 'null' )
+            // InternalMenuDsl.g:14822:1: ( ( 'null' ) )
+            // InternalMenuDsl.g:14823:1: ( 'null' )
             {
-            // InternalMenuDsl.g:14692:1: ( 'null' )
-            // InternalMenuDsl.g:14693:2: 'null'
+            // InternalMenuDsl.g:14823:1: ( 'null' )
+            // InternalMenuDsl.g:14824:2: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
-            match(input,79,FOLLOW_2); if (state.failed) return ;
+            match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
@@ -48840,16 +49271,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0"
-    // InternalMenuDsl.g:14703:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
+    // InternalMenuDsl.g:14834: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 {
-            // InternalMenuDsl.g:14707:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
-            // InternalMenuDsl.g:14708:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
+            // InternalMenuDsl.g:14838:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
+            // InternalMenuDsl.g:14839:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
             {
-            pushFollow(FOLLOW_93);
+            pushFollow(FOLLOW_96);
             rule__XNumberLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -48878,23 +49309,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0__Impl"
-    // InternalMenuDsl.g:14715:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:14846:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14719:1: ( ( () ) )
-            // InternalMenuDsl.g:14720:1: ( () )
+            // InternalMenuDsl.g:14850:1: ( ( () ) )
+            // InternalMenuDsl.g:14851:1: ( () )
             {
-            // InternalMenuDsl.g:14720:1: ( () )
-            // InternalMenuDsl.g:14721:2: ()
+            // InternalMenuDsl.g:14851:1: ( () )
+            // InternalMenuDsl.g:14852:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getXNumberLiteralAction_0()); 
             }
-            // InternalMenuDsl.g:14722:2: ()
-            // InternalMenuDsl.g:14722:3: 
+            // InternalMenuDsl.g:14853:2: ()
+            // InternalMenuDsl.g:14853:3: 
             {
             }
 
@@ -48919,14 +49350,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1"
-    // InternalMenuDsl.g:14730:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
+    // InternalMenuDsl.g:14861:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
     public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14734:1: ( rule__XNumberLiteral__Group__1__Impl )
-            // InternalMenuDsl.g:14735:2: rule__XNumberLiteral__Group__1__Impl
+            // InternalMenuDsl.g:14865:1: ( rule__XNumberLiteral__Group__1__Impl )
+            // InternalMenuDsl.g:14866:2: rule__XNumberLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1__Impl();
@@ -48952,23 +49383,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1__Impl"
-    // InternalMenuDsl.g:14741:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
+    // InternalMenuDsl.g:14872:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14745:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
-            // InternalMenuDsl.g:14746:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalMenuDsl.g:14876:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
+            // InternalMenuDsl.g:14877:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
             {
-            // InternalMenuDsl.g:14746:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
-            // InternalMenuDsl.g:14747:2: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalMenuDsl.g:14877:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalMenuDsl.g:14878:2: ( rule__XNumberLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueAssignment_1()); 
             }
-            // InternalMenuDsl.g:14748:2: ( rule__XNumberLiteral__ValueAssignment_1 )
-            // InternalMenuDsl.g:14748:3: rule__XNumberLiteral__ValueAssignment_1
+            // InternalMenuDsl.g:14879:2: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalMenuDsl.g:14879:3: rule__XNumberLiteral__ValueAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XNumberLiteral__ValueAssignment_1();
@@ -49003,16 +49434,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0"
-    // InternalMenuDsl.g:14757:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
+    // InternalMenuDsl.g:14888: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 {
-            // InternalMenuDsl.g:14761:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
-            // InternalMenuDsl.g:14762:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
+            // InternalMenuDsl.g:14892:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
+            // InternalMenuDsl.g:14893:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_8);
             rule__XStringLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -49041,23 +49472,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0__Impl"
-    // InternalMenuDsl.g:14769:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:14900:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14773:1: ( ( () ) )
-            // InternalMenuDsl.g:14774:1: ( () )
+            // InternalMenuDsl.g:14904:1: ( ( () ) )
+            // InternalMenuDsl.g:14905:1: ( () )
             {
-            // InternalMenuDsl.g:14774:1: ( () )
-            // InternalMenuDsl.g:14775:2: ()
+            // InternalMenuDsl.g:14905:1: ( () )
+            // InternalMenuDsl.g:14906:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getXStringLiteralAction_0()); 
             }
-            // InternalMenuDsl.g:14776:2: ()
-            // InternalMenuDsl.g:14776:3: 
+            // InternalMenuDsl.g:14907:2: ()
+            // InternalMenuDsl.g:14907:3: 
             {
             }
 
@@ -49082,14 +49513,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1"
-    // InternalMenuDsl.g:14784:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
+    // InternalMenuDsl.g:14915:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
     public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14788:1: ( rule__XStringLiteral__Group__1__Impl )
-            // InternalMenuDsl.g:14789:2: rule__XStringLiteral__Group__1__Impl
+            // InternalMenuDsl.g:14919:1: ( rule__XStringLiteral__Group__1__Impl )
+            // InternalMenuDsl.g:14920:2: rule__XStringLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1__Impl();
@@ -49115,23 +49546,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1__Impl"
-    // InternalMenuDsl.g:14795:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
+    // InternalMenuDsl.g:14926:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14799:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
-            // InternalMenuDsl.g:14800:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalMenuDsl.g:14930:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
+            // InternalMenuDsl.g:14931:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
             {
-            // InternalMenuDsl.g:14800:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
-            // InternalMenuDsl.g:14801:2: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalMenuDsl.g:14931:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalMenuDsl.g:14932:2: ( rule__XStringLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueAssignment_1()); 
             }
-            // InternalMenuDsl.g:14802:2: ( rule__XStringLiteral__ValueAssignment_1 )
-            // InternalMenuDsl.g:14802:3: rule__XStringLiteral__ValueAssignment_1
+            // InternalMenuDsl.g:14933:2: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalMenuDsl.g:14933:3: rule__XStringLiteral__ValueAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XStringLiteral__ValueAssignment_1();
@@ -49166,16 +49597,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0"
-    // InternalMenuDsl.g:14811:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
+    // InternalMenuDsl.g:14942: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 {
-            // InternalMenuDsl.g:14815:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
-            // InternalMenuDsl.g:14816:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
+            // InternalMenuDsl.g:14946:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
+            // InternalMenuDsl.g:14947:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
             {
-            pushFollow(FOLLOW_94);
+            pushFollow(FOLLOW_97);
             rule__XTypeLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -49204,23 +49635,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0__Impl"
-    // InternalMenuDsl.g:14823:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:14954:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14827:1: ( ( () ) )
-            // InternalMenuDsl.g:14828:1: ( () )
+            // InternalMenuDsl.g:14958:1: ( ( () ) )
+            // InternalMenuDsl.g:14959:1: ( () )
             {
-            // InternalMenuDsl.g:14828:1: ( () )
-            // InternalMenuDsl.g:14829:2: ()
+            // InternalMenuDsl.g:14959:1: ( () )
+            // InternalMenuDsl.g:14960:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getXTypeLiteralAction_0()); 
             }
-            // InternalMenuDsl.g:14830:2: ()
-            // InternalMenuDsl.g:14830:3: 
+            // InternalMenuDsl.g:14961:2: ()
+            // InternalMenuDsl.g:14961:3: 
             {
             }
 
@@ -49245,16 +49676,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1"
-    // InternalMenuDsl.g:14838:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
+    // InternalMenuDsl.g:14969: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 {
-            // InternalMenuDsl.g:14842:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
-            // InternalMenuDsl.g:14843:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
+            // InternalMenuDsl.g:14973:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
+            // InternalMenuDsl.g:14974:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XTypeLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -49283,22 +49714,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1__Impl"
-    // InternalMenuDsl.g:14850:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
+    // InternalMenuDsl.g:14981:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
     public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14854:1: ( ( 'typeof' ) )
-            // InternalMenuDsl.g:14855:1: ( 'typeof' )
+            // InternalMenuDsl.g:14985:1: ( ( 'typeof' ) )
+            // InternalMenuDsl.g:14986:1: ( 'typeof' )
             {
-            // InternalMenuDsl.g:14855:1: ( 'typeof' )
-            // InternalMenuDsl.g:14856:2: 'typeof'
+            // InternalMenuDsl.g:14986:1: ( 'typeof' )
+            // InternalMenuDsl.g:14987:2: 'typeof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
-            match(input,80,FOLLOW_2); if (state.failed) return ;
+            match(input,82,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
@@ -49324,16 +49755,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2"
-    // InternalMenuDsl.g:14865:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
+    // InternalMenuDsl.g:14996: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 {
-            // InternalMenuDsl.g:14869:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
-            // InternalMenuDsl.g:14870:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
+            // InternalMenuDsl.g:15000:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
+            // InternalMenuDsl.g:15001:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__XTypeLiteral__Group__2__Impl();
 
             state._fsp--;
@@ -49362,22 +49793,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2__Impl"
-    // InternalMenuDsl.g:14877:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:15008:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
     public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14881:1: ( ( '(' ) )
-            // InternalMenuDsl.g:14882:1: ( '(' )
+            // InternalMenuDsl.g:15012:1: ( ( '(' ) )
+            // InternalMenuDsl.g:15013:1: ( '(' )
             {
-            // InternalMenuDsl.g:14882:1: ( '(' )
-            // InternalMenuDsl.g:14883:2: '('
+            // InternalMenuDsl.g:15013:1: ( '(' )
+            // InternalMenuDsl.g:15014:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -49403,16 +49834,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3"
-    // InternalMenuDsl.g:14892:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
+    // InternalMenuDsl.g:15023: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 {
-            // InternalMenuDsl.g:14896:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
-            // InternalMenuDsl.g:14897:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
+            // InternalMenuDsl.g:15027:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
+            // InternalMenuDsl.g:15028:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
             {
-            pushFollow(FOLLOW_95);
+            pushFollow(FOLLOW_98);
             rule__XTypeLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -49441,23 +49872,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3__Impl"
-    // InternalMenuDsl.g:14904:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
+    // InternalMenuDsl.g:15035:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
     public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14908:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
-            // InternalMenuDsl.g:14909:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalMenuDsl.g:15039:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
+            // InternalMenuDsl.g:15040:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
             {
-            // InternalMenuDsl.g:14909:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
-            // InternalMenuDsl.g:14910:2: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalMenuDsl.g:15040:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalMenuDsl.g:15041:2: ( rule__XTypeLiteral__TypeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeAssignment_3()); 
             }
-            // InternalMenuDsl.g:14911:2: ( rule__XTypeLiteral__TypeAssignment_3 )
-            // InternalMenuDsl.g:14911:3: rule__XTypeLiteral__TypeAssignment_3
+            // InternalMenuDsl.g:15042:2: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalMenuDsl.g:15042:3: rule__XTypeLiteral__TypeAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XTypeLiteral__TypeAssignment_3();
@@ -49492,16 +49923,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4"
-    // InternalMenuDsl.g:14919:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
+    // InternalMenuDsl.g:15050: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 {
-            // InternalMenuDsl.g:14923:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
-            // InternalMenuDsl.g:14924:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
+            // InternalMenuDsl.g:15054:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
+            // InternalMenuDsl.g:15055:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
             {
-            pushFollow(FOLLOW_95);
+            pushFollow(FOLLOW_98);
             rule__XTypeLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -49530,37 +49961,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4__Impl"
-    // InternalMenuDsl.g:14931:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
+    // InternalMenuDsl.g:15062:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
     public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14935:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
-            // InternalMenuDsl.g:14936:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalMenuDsl.g:15066:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
+            // InternalMenuDsl.g:15067:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
             {
-            // InternalMenuDsl.g:14936:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
-            // InternalMenuDsl.g:14937:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalMenuDsl.g:15067:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalMenuDsl.g:15068:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsAssignment_4()); 
             }
-            // InternalMenuDsl.g:14938:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
-            loop128:
+            // InternalMenuDsl.g:15069:2: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            loop126:
             do {
-                int alt128=2;
-                int LA128_0 = input.LA(1);
+                int alt126=2;
+                int LA126_0 = input.LA(1);
 
-                if ( (LA128_0==66) ) {
-                    alt128=1;
+                if ( (LA126_0==68) ) {
+                    alt126=1;
                 }
 
 
-                switch (alt128) {
+                switch (alt126) {
             	case 1 :
-            	    // InternalMenuDsl.g:14938:3: rule__XTypeLiteral__ArrayDimensionsAssignment_4
+            	    // InternalMenuDsl.g:15069:3: rule__XTypeLiteral__ArrayDimensionsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_96);
+            	    pushFollow(FOLLOW_99);
             	    rule__XTypeLiteral__ArrayDimensionsAssignment_4();
 
             	    state._fsp--;
@@ -49570,7 +50001,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop128;
+            	    break loop126;
                 }
             } while (true);
 
@@ -49599,14 +50030,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5"
-    // InternalMenuDsl.g:14946:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
+    // InternalMenuDsl.g:15077:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
     public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14950:1: ( rule__XTypeLiteral__Group__5__Impl )
-            // InternalMenuDsl.g:14951:2: rule__XTypeLiteral__Group__5__Impl
+            // InternalMenuDsl.g:15081:1: ( rule__XTypeLiteral__Group__5__Impl )
+            // InternalMenuDsl.g:15082:2: rule__XTypeLiteral__Group__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5__Impl();
@@ -49632,22 +50063,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5__Impl"
-    // InternalMenuDsl.g:14957:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:15088:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
     public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14961:1: ( ( ')' ) )
-            // InternalMenuDsl.g:14962:1: ( ')' )
+            // InternalMenuDsl.g:15092:1: ( ( ')' ) )
+            // InternalMenuDsl.g:15093:1: ( ')' )
             {
-            // InternalMenuDsl.g:14962:1: ( ')' )
-            // InternalMenuDsl.g:14963:2: ')'
+            // InternalMenuDsl.g:15093:1: ( ')' )
+            // InternalMenuDsl.g:15094:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
@@ -49673,16 +50104,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0"
-    // InternalMenuDsl.g:14973:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
+    // InternalMenuDsl.g:15104: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 {
-            // InternalMenuDsl.g:14977:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
-            // InternalMenuDsl.g:14978:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
+            // InternalMenuDsl.g:15108:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
+            // InternalMenuDsl.g:15109:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
             {
-            pushFollow(FOLLOW_97);
+            pushFollow(FOLLOW_100);
             rule__XThrowExpression__Group__0__Impl();
 
             state._fsp--;
@@ -49711,23 +50142,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0__Impl"
-    // InternalMenuDsl.g:14985:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:15116:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
     public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:14989:1: ( ( () ) )
-            // InternalMenuDsl.g:14990:1: ( () )
+            // InternalMenuDsl.g:15120:1: ( ( () ) )
+            // InternalMenuDsl.g:15121:1: ( () )
             {
-            // InternalMenuDsl.g:14990:1: ( () )
-            // InternalMenuDsl.g:14991:2: ()
+            // InternalMenuDsl.g:15121:1: ( () )
+            // InternalMenuDsl.g:15122:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getXThrowExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:14992:2: ()
-            // InternalMenuDsl.g:14992:3: 
+            // InternalMenuDsl.g:15123:2: ()
+            // InternalMenuDsl.g:15123:3: 
             {
             }
 
@@ -49752,16 +50183,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1"
-    // InternalMenuDsl.g:15000:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
+    // InternalMenuDsl.g:15131: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 {
-            // InternalMenuDsl.g:15004:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
-            // InternalMenuDsl.g:15005:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
+            // InternalMenuDsl.g:15135:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
+            // InternalMenuDsl.g:15136:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XThrowExpression__Group__1__Impl();
 
             state._fsp--;
@@ -49790,22 +50221,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1__Impl"
-    // InternalMenuDsl.g:15012:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
+    // InternalMenuDsl.g:15143:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
     public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15016:1: ( ( 'throw' ) )
-            // InternalMenuDsl.g:15017:1: ( 'throw' )
+            // InternalMenuDsl.g:15147:1: ( ( 'throw' ) )
+            // InternalMenuDsl.g:15148:1: ( 'throw' )
             {
-            // InternalMenuDsl.g:15017:1: ( 'throw' )
-            // InternalMenuDsl.g:15018:2: 'throw'
+            // InternalMenuDsl.g:15148:1: ( 'throw' )
+            // InternalMenuDsl.g:15149:2: 'throw'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
-            match(input,81,FOLLOW_2); if (state.failed) return ;
+            match(input,83,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
@@ -49831,14 +50262,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2"
-    // InternalMenuDsl.g:15027:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
+    // InternalMenuDsl.g:15158:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
     public final void rule__XThrowExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15031:1: ( rule__XThrowExpression__Group__2__Impl )
-            // InternalMenuDsl.g:15032:2: rule__XThrowExpression__Group__2__Impl
+            // InternalMenuDsl.g:15162:1: ( rule__XThrowExpression__Group__2__Impl )
+            // InternalMenuDsl.g:15163:2: rule__XThrowExpression__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2__Impl();
@@ -49864,23 +50295,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2__Impl"
-    // InternalMenuDsl.g:15038:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
+    // InternalMenuDsl.g:15169:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15042:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
-            // InternalMenuDsl.g:15043:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalMenuDsl.g:15173:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
+            // InternalMenuDsl.g:15174:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
             {
-            // InternalMenuDsl.g:15043:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
-            // InternalMenuDsl.g:15044:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalMenuDsl.g:15174:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalMenuDsl.g:15175:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionAssignment_2()); 
             }
-            // InternalMenuDsl.g:15045:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
-            // InternalMenuDsl.g:15045:3: rule__XThrowExpression__ExpressionAssignment_2
+            // InternalMenuDsl.g:15176:2: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalMenuDsl.g:15176:3: rule__XThrowExpression__ExpressionAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XThrowExpression__ExpressionAssignment_2();
@@ -49915,16 +50346,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0"
-    // InternalMenuDsl.g:15054:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
+    // InternalMenuDsl.g:15185: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 {
-            // InternalMenuDsl.g:15058:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
-            // InternalMenuDsl.g:15059:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
+            // InternalMenuDsl.g:15189:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
+            // InternalMenuDsl.g:15190:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
             {
-            pushFollow(FOLLOW_98);
+            pushFollow(FOLLOW_101);
             rule__XReturnExpression__Group__0__Impl();
 
             state._fsp--;
@@ -49953,23 +50384,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0__Impl"
-    // InternalMenuDsl.g:15066:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:15197:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
     public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15070:1: ( ( () ) )
-            // InternalMenuDsl.g:15071:1: ( () )
+            // InternalMenuDsl.g:15201:1: ( ( () ) )
+            // InternalMenuDsl.g:15202:1: ( () )
             {
-            // InternalMenuDsl.g:15071:1: ( () )
-            // InternalMenuDsl.g:15072:2: ()
+            // InternalMenuDsl.g:15202:1: ( () )
+            // InternalMenuDsl.g:15203:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getXReturnExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:15073:2: ()
-            // InternalMenuDsl.g:15073:3: 
+            // InternalMenuDsl.g:15204:2: ()
+            // InternalMenuDsl.g:15204:3: 
             {
             }
 
@@ -49994,16 +50425,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1"
-    // InternalMenuDsl.g:15081:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
+    // InternalMenuDsl.g:15212: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 {
-            // InternalMenuDsl.g:15085:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
-            // InternalMenuDsl.g:15086:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
+            // InternalMenuDsl.g:15216:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
+            // InternalMenuDsl.g:15217:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XReturnExpression__Group__1__Impl();
 
             state._fsp--;
@@ -50032,22 +50463,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1__Impl"
-    // InternalMenuDsl.g:15093:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
+    // InternalMenuDsl.g:15224:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
     public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15097:1: ( ( 'return' ) )
-            // InternalMenuDsl.g:15098:1: ( 'return' )
+            // InternalMenuDsl.g:15228:1: ( ( 'return' ) )
+            // InternalMenuDsl.g:15229:1: ( 'return' )
             {
-            // InternalMenuDsl.g:15098:1: ( 'return' )
-            // InternalMenuDsl.g:15099:2: 'return'
+            // InternalMenuDsl.g:15229:1: ( 'return' )
+            // InternalMenuDsl.g:15230:2: 'return'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
-            match(input,82,FOLLOW_2); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
@@ -50073,14 +50504,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2"
-    // InternalMenuDsl.g:15108:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
+    // InternalMenuDsl.g:15239:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
     public final void rule__XReturnExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15112:1: ( rule__XReturnExpression__Group__2__Impl )
-            // InternalMenuDsl.g:15113:2: rule__XReturnExpression__Group__2__Impl
+            // InternalMenuDsl.g:15243:1: ( rule__XReturnExpression__Group__2__Impl )
+            // InternalMenuDsl.g:15244:2: rule__XReturnExpression__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2__Impl();
@@ -50106,27 +50537,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2__Impl"
-    // InternalMenuDsl.g:15119:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
+    // InternalMenuDsl.g:15250:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
     public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15123:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
-            // InternalMenuDsl.g:15124:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalMenuDsl.g:15254:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
+            // InternalMenuDsl.g:15255:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
             {
-            // InternalMenuDsl.g:15124:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
-            // InternalMenuDsl.g:15125:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalMenuDsl.g:15255:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalMenuDsl.g:15256:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionAssignment_2()); 
             }
-            // InternalMenuDsl.g:15126:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
-            int alt129=2;
-            alt129 = dfa129.predict(input);
-            switch (alt129) {
+            // InternalMenuDsl.g:15257:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            int alt127=2;
+            alt127 = dfa127.predict(input);
+            switch (alt127) {
                 case 1 :
-                    // InternalMenuDsl.g:15126:3: rule__XReturnExpression__ExpressionAssignment_2
+                    // InternalMenuDsl.g:15257:3: rule__XReturnExpression__ExpressionAssignment_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__XReturnExpression__ExpressionAssignment_2();
@@ -50164,16 +50595,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0"
-    // InternalMenuDsl.g:15135:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
+    // InternalMenuDsl.g:15266: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 {
-            // InternalMenuDsl.g:15139:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
-            // InternalMenuDsl.g:15140:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
+            // InternalMenuDsl.g:15270:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
+            // InternalMenuDsl.g:15271:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
             {
-            pushFollow(FOLLOW_99);
+            pushFollow(FOLLOW_102);
             rule__XTryCatchFinallyExpression__Group__0__Impl();
 
             state._fsp--;
@@ -50202,23 +50633,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0__Impl"
-    // InternalMenuDsl.g:15147:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:15278:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
     public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15151:1: ( ( () ) )
-            // InternalMenuDsl.g:15152:1: ( () )
+            // InternalMenuDsl.g:15282:1: ( ( () ) )
+            // InternalMenuDsl.g:15283:1: ( () )
             {
-            // InternalMenuDsl.g:15152:1: ( () )
-            // InternalMenuDsl.g:15153:2: ()
+            // InternalMenuDsl.g:15283:1: ( () )
+            // InternalMenuDsl.g:15284:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getXTryCatchFinallyExpressionAction_0()); 
             }
-            // InternalMenuDsl.g:15154:2: ()
-            // InternalMenuDsl.g:15154:3: 
+            // InternalMenuDsl.g:15285:2: ()
+            // InternalMenuDsl.g:15285:3: 
             {
             }
 
@@ -50243,16 +50674,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1"
-    // InternalMenuDsl.g:15162:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
+    // InternalMenuDsl.g:15293: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 {
-            // InternalMenuDsl.g:15166:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
-            // InternalMenuDsl.g:15167:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
+            // InternalMenuDsl.g:15297:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
+            // InternalMenuDsl.g:15298:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XTryCatchFinallyExpression__Group__1__Impl();
 
             state._fsp--;
@@ -50281,22 +50712,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1__Impl"
-    // InternalMenuDsl.g:15174:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
+    // InternalMenuDsl.g:15305:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
     public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15178:1: ( ( 'try' ) )
-            // InternalMenuDsl.g:15179:1: ( 'try' )
+            // InternalMenuDsl.g:15309:1: ( ( 'try' ) )
+            // InternalMenuDsl.g:15310:1: ( 'try' )
             {
-            // InternalMenuDsl.g:15179:1: ( 'try' )
-            // InternalMenuDsl.g:15180:2: 'try'
+            // InternalMenuDsl.g:15310:1: ( 'try' )
+            // InternalMenuDsl.g:15311:2: 'try'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
-            match(input,83,FOLLOW_2); if (state.failed) return ;
+            match(input,85,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
@@ -50322,16 +50753,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2"
-    // InternalMenuDsl.g:15189:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
+    // InternalMenuDsl.g:15320: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 {
-            // InternalMenuDsl.g:15193:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
-            // InternalMenuDsl.g:15194:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
+            // InternalMenuDsl.g:15324:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
+            // InternalMenuDsl.g:15325:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
             {
-            pushFollow(FOLLOW_100);
+            pushFollow(FOLLOW_103);
             rule__XTryCatchFinallyExpression__Group__2__Impl();
 
             state._fsp--;
@@ -50360,23 +50791,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2__Impl"
-    // InternalMenuDsl.g:15201:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
+    // InternalMenuDsl.g:15332:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15205:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
-            // InternalMenuDsl.g:15206:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalMenuDsl.g:15336:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
+            // InternalMenuDsl.g:15337:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
             {
-            // InternalMenuDsl.g:15206:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
-            // InternalMenuDsl.g:15207:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalMenuDsl.g:15337:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalMenuDsl.g:15338:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionAssignment_2()); 
             }
-            // InternalMenuDsl.g:15208:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
-            // InternalMenuDsl.g:15208:3: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
+            // InternalMenuDsl.g:15339:2: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalMenuDsl.g:15339:3: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__ExpressionAssignment_2();
@@ -50411,14 +50842,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3"
-    // InternalMenuDsl.g:15216:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
+    // InternalMenuDsl.g:15347:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15220:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
-            // InternalMenuDsl.g:15221:2: rule__XTryCatchFinallyExpression__Group__3__Impl
+            // InternalMenuDsl.g:15351:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
+            // InternalMenuDsl.g:15352:2: rule__XTryCatchFinallyExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3__Impl();
@@ -50444,23 +50875,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3__Impl"
-    // InternalMenuDsl.g:15227:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
+    // InternalMenuDsl.g:15358:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15231:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
-            // InternalMenuDsl.g:15232:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalMenuDsl.g:15362:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
+            // InternalMenuDsl.g:15363:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
             {
-            // InternalMenuDsl.g:15232:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
-            // InternalMenuDsl.g:15233:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalMenuDsl.g:15363:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalMenuDsl.g:15364:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getAlternatives_3()); 
             }
-            // InternalMenuDsl.g:15234:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
-            // InternalMenuDsl.g:15234:3: rule__XTryCatchFinallyExpression__Alternatives_3
+            // InternalMenuDsl.g:15365:2: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalMenuDsl.g:15365:3: rule__XTryCatchFinallyExpression__Alternatives_3
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Alternatives_3();
@@ -50495,16 +50926,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0"
-    // InternalMenuDsl.g:15243:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
+    // InternalMenuDsl.g:15374: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 {
-            // InternalMenuDsl.g:15247:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
-            // InternalMenuDsl.g:15248:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
+            // InternalMenuDsl.g:15378:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
+            // InternalMenuDsl.g:15379:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
             {
-            pushFollow(FOLLOW_101);
+            pushFollow(FOLLOW_104);
             rule__XTryCatchFinallyExpression__Group_3_0__0__Impl();
 
             state._fsp--;
@@ -50533,28 +50964,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0__Impl"
-    // InternalMenuDsl.g:15255:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
+    // InternalMenuDsl.g:15386: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 {
-            // InternalMenuDsl.g:15259:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
-            // InternalMenuDsl.g:15260:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalMenuDsl.g:15390:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
+            // InternalMenuDsl.g:15391:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
             {
-            // InternalMenuDsl.g:15260:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
-            // InternalMenuDsl.g:15261:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalMenuDsl.g:15391:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalMenuDsl.g:15392:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
             {
-            // InternalMenuDsl.g:15261:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
-            // InternalMenuDsl.g:15262:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalMenuDsl.g:15392:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
+            // InternalMenuDsl.g:15393:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // InternalMenuDsl.g:15263:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-            // InternalMenuDsl.g:15263:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            // InternalMenuDsl.g:15394:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalMenuDsl.g:15394:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             {
-            pushFollow(FOLLOW_102);
+            pushFollow(FOLLOW_105);
             rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             state._fsp--;
@@ -50568,34 +50999,34 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
             }
 
-            // InternalMenuDsl.g:15266:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
-            // InternalMenuDsl.g:15267:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalMenuDsl.g:15397:2: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalMenuDsl.g:15398:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // InternalMenuDsl.g:15268:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
-            loop130:
+            // InternalMenuDsl.g:15399:3: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            loop128:
             do {
-                int alt130=2;
-                int LA130_0 = input.LA(1);
+                int alt128=2;
+                int LA128_0 = input.LA(1);
 
-                if ( (LA130_0==86) ) {
-                    int LA130_2 = input.LA(2);
+                if ( (LA128_0==88) ) {
+                    int LA128_2 = input.LA(2);
 
-                    if ( (synpred178_InternalMenuDsl()) ) {
-                        alt130=1;
+                    if ( (synpred177_InternalMenuDsl()) ) {
+                        alt128=1;
                     }
 
 
                 }
 
 
-                switch (alt130) {
+                switch (alt128) {
             	case 1 :
-            	    // InternalMenuDsl.g:15268:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            	    // InternalMenuDsl.g:15399:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             	    {
-            	    pushFollow(FOLLOW_102);
+            	    pushFollow(FOLLOW_105);
             	    rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             	    state._fsp--;
@@ -50605,7 +51036,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop130;
+            	    break loop128;
                 }
             } while (true);
 
@@ -50637,14 +51068,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1"
-    // InternalMenuDsl.g:15277:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
+    // InternalMenuDsl.g:15408: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 {
-            // InternalMenuDsl.g:15281:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
-            // InternalMenuDsl.g:15282:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
+            // InternalMenuDsl.g:15412:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
+            // InternalMenuDsl.g:15413:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1__Impl();
@@ -50670,35 +51101,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1__Impl"
-    // InternalMenuDsl.g:15288:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
+    // InternalMenuDsl.g:15419: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 {
-            // InternalMenuDsl.g:15292:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
-            // InternalMenuDsl.g:15293:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalMenuDsl.g:15423:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
+            // InternalMenuDsl.g:15424:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
             {
-            // InternalMenuDsl.g:15293:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
-            // InternalMenuDsl.g:15294:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalMenuDsl.g:15424:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalMenuDsl.g:15425:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0_1()); 
             }
-            // InternalMenuDsl.g:15295:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
-            int alt131=2;
-            int LA131_0 = input.LA(1);
+            // InternalMenuDsl.g:15426:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            int alt129=2;
+            int LA129_0 = input.LA(1);
 
-            if ( (LA131_0==84) ) {
-                int LA131_1 = input.LA(2);
+            if ( (LA129_0==86) ) {
+                int LA129_1 = input.LA(2);
 
-                if ( (synpred179_InternalMenuDsl()) ) {
-                    alt131=1;
+                if ( (synpred178_InternalMenuDsl()) ) {
+                    alt129=1;
                 }
             }
-            switch (alt131) {
+            switch (alt129) {
                 case 1 :
-                    // InternalMenuDsl.g:15295:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+                    // InternalMenuDsl.g:15426:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0_1__0();
@@ -50736,16 +51167,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0"
-    // InternalMenuDsl.g:15304:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
+    // InternalMenuDsl.g:15435: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 {
-            // InternalMenuDsl.g:15308:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
-            // InternalMenuDsl.g:15309:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
+            // InternalMenuDsl.g:15439:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
+            // InternalMenuDsl.g:15440:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl();
 
             state._fsp--;
@@ -50774,25 +51205,25 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl"
-    // InternalMenuDsl.g:15316:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
+    // InternalMenuDsl.g:15447: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 {
-            // InternalMenuDsl.g:15320:1: ( ( ( 'finally' ) ) )
-            // InternalMenuDsl.g:15321:1: ( ( 'finally' ) )
+            // InternalMenuDsl.g:15451:1: ( ( ( 'finally' ) ) )
+            // InternalMenuDsl.g:15452:1: ( ( 'finally' ) )
             {
-            // InternalMenuDsl.g:15321:1: ( ( 'finally' ) )
-            // InternalMenuDsl.g:15322:2: ( 'finally' )
+            // InternalMenuDsl.g:15452:1: ( ( 'finally' ) )
+            // InternalMenuDsl.g:15453:2: ( 'finally' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0()); 
             }
-            // InternalMenuDsl.g:15323:2: ( 'finally' )
-            // InternalMenuDsl.g:15323:3: 'finally'
+            // InternalMenuDsl.g:15454:2: ( 'finally' )
+            // InternalMenuDsl.g:15454:3: 'finally'
             {
-            match(input,84,FOLLOW_2); if (state.failed) return ;
+            match(input,86,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -50821,14 +51252,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1"
-    // InternalMenuDsl.g:15331:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
+    // InternalMenuDsl.g:15462: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 {
-            // InternalMenuDsl.g:15335:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
-            // InternalMenuDsl.g:15336:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
+            // InternalMenuDsl.g:15466:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
+            // InternalMenuDsl.g:15467:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl();
@@ -50854,23 +51285,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl"
-    // InternalMenuDsl.g:15342:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
+    // InternalMenuDsl.g:15473: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 {
-            // InternalMenuDsl.g:15346:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
-            // InternalMenuDsl.g:15347:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalMenuDsl.g:15477:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
+            // InternalMenuDsl.g:15478:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
             {
-            // InternalMenuDsl.g:15347:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
-            // InternalMenuDsl.g:15348:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalMenuDsl.g:15478:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalMenuDsl.g:15479:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_0_1_1()); 
             }
-            // InternalMenuDsl.g:15349:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
-            // InternalMenuDsl.g:15349:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
+            // InternalMenuDsl.g:15480:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalMenuDsl.g:15480:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1();
@@ -50905,16 +51336,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0"
-    // InternalMenuDsl.g:15358:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
+    // InternalMenuDsl.g:15489: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 {
-            // InternalMenuDsl.g:15362:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
-            // InternalMenuDsl.g:15363:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
+            // InternalMenuDsl.g:15493:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
+            // InternalMenuDsl.g:15494:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XTryCatchFinallyExpression__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -50943,22 +51374,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0__Impl"
-    // InternalMenuDsl.g:15370:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
+    // InternalMenuDsl.g:15501: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 {
-            // InternalMenuDsl.g:15374:1: ( ( 'finally' ) )
-            // InternalMenuDsl.g:15375:1: ( 'finally' )
+            // InternalMenuDsl.g:15505:1: ( ( 'finally' ) )
+            // InternalMenuDsl.g:15506:1: ( 'finally' )
             {
-            // InternalMenuDsl.g:15375:1: ( 'finally' )
-            // InternalMenuDsl.g:15376:2: 'finally'
+            // InternalMenuDsl.g:15506:1: ( 'finally' )
+            // InternalMenuDsl.g:15507:2: 'finally'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
-            match(input,84,FOLLOW_2); if (state.failed) return ;
+            match(input,86,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
@@ -50984,14 +51415,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1"
-    // InternalMenuDsl.g:15385:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
+    // InternalMenuDsl.g:15516: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 {
-            // InternalMenuDsl.g:15389:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
-            // InternalMenuDsl.g:15390:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
+            // InternalMenuDsl.g:15520:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
+            // InternalMenuDsl.g:15521:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1__Impl();
@@ -51017,23 +51448,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1__Impl"
-    // InternalMenuDsl.g:15396:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
+    // InternalMenuDsl.g:15527: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 {
-            // InternalMenuDsl.g:15400:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
-            // InternalMenuDsl.g:15401:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:15531:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
+            // InternalMenuDsl.g:15532:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
             {
-            // InternalMenuDsl.g:15401:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
-            // InternalMenuDsl.g:15402:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalMenuDsl.g:15532:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalMenuDsl.g:15533:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_1_1()); 
             }
-            // InternalMenuDsl.g:15403:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
-            // InternalMenuDsl.g:15403:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
+            // InternalMenuDsl.g:15534:2: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalMenuDsl.g:15534:3: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1();
@@ -51068,16 +51499,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0"
-    // InternalMenuDsl.g:15412:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
+    // InternalMenuDsl.g:15543: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 {
-            // InternalMenuDsl.g:15416:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
-            // InternalMenuDsl.g:15417:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
+            // InternalMenuDsl.g:15547:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
+            // InternalMenuDsl.g:15548:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XSynchronizedExpression__Group__0__Impl();
 
             state._fsp--;
@@ -51106,23 +51537,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0__Impl"
-    // InternalMenuDsl.g:15424:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
+    // InternalMenuDsl.g:15555: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 {
-            // InternalMenuDsl.g:15428:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
-            // InternalMenuDsl.g:15429:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalMenuDsl.g:15559:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
+            // InternalMenuDsl.g:15560:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
             {
-            // InternalMenuDsl.g:15429:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
-            // InternalMenuDsl.g:15430:2: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalMenuDsl.g:15560:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalMenuDsl.g:15561:2: ( rule__XSynchronizedExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0()); 
             }
-            // InternalMenuDsl.g:15431:2: ( rule__XSynchronizedExpression__Group_0__0 )
-            // InternalMenuDsl.g:15431:3: rule__XSynchronizedExpression__Group_0__0
+            // InternalMenuDsl.g:15562:2: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalMenuDsl.g:15562:3: rule__XSynchronizedExpression__Group_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0();
@@ -51157,16 +51588,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1"
-    // InternalMenuDsl.g:15439:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
+    // InternalMenuDsl.g:15570: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 {
-            // InternalMenuDsl.g:15443:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
-            // InternalMenuDsl.g:15444:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
+            // InternalMenuDsl.g:15574:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
+            // InternalMenuDsl.g:15575:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XSynchronizedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -51195,23 +51626,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1__Impl"
-    // InternalMenuDsl.g:15451:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
+    // InternalMenuDsl.g:15582:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
     public final void rule__XSynchronizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15455:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
-            // InternalMenuDsl.g:15456:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalMenuDsl.g:15586:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
+            // InternalMenuDsl.g:15587:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
             {
-            // InternalMenuDsl.g:15456:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
-            // InternalMenuDsl.g:15457:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalMenuDsl.g:15587:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalMenuDsl.g:15588:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamAssignment_1()); 
             }
-            // InternalMenuDsl.g:15458:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
-            // InternalMenuDsl.g:15458:3: rule__XSynchronizedExpression__ParamAssignment_1
+            // InternalMenuDsl.g:15589:2: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalMenuDsl.g:15589:3: rule__XSynchronizedExpression__ParamAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ParamAssignment_1();
@@ -51246,16 +51677,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2"
-    // InternalMenuDsl.g:15466:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
+    // InternalMenuDsl.g:15597: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 {
-            // InternalMenuDsl.g:15470:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
-            // InternalMenuDsl.g:15471:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
+            // InternalMenuDsl.g:15601:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
+            // InternalMenuDsl.g:15602:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XSynchronizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -51284,22 +51715,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2__Impl"
-    // InternalMenuDsl.g:15478:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:15609:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XSynchronizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15482:1: ( ( ')' ) )
-            // InternalMenuDsl.g:15483:1: ( ')' )
+            // InternalMenuDsl.g:15613:1: ( ( ')' ) )
+            // InternalMenuDsl.g:15614:1: ( ')' )
             {
-            // InternalMenuDsl.g:15483:1: ( ')' )
-            // InternalMenuDsl.g:15484:2: ')'
+            // InternalMenuDsl.g:15614:1: ( ')' )
+            // InternalMenuDsl.g:15615:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -51325,14 +51756,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3"
-    // InternalMenuDsl.g:15493:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
+    // InternalMenuDsl.g:15624:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
     public final void rule__XSynchronizedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15497:1: ( rule__XSynchronizedExpression__Group__3__Impl )
-            // InternalMenuDsl.g:15498:2: rule__XSynchronizedExpression__Group__3__Impl
+            // InternalMenuDsl.g:15628:1: ( rule__XSynchronizedExpression__Group__3__Impl )
+            // InternalMenuDsl.g:15629:2: rule__XSynchronizedExpression__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3__Impl();
@@ -51358,23 +51789,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3__Impl"
-    // InternalMenuDsl.g:15504:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
+    // InternalMenuDsl.g:15635:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
     public final void rule__XSynchronizedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15508:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
-            // InternalMenuDsl.g:15509:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalMenuDsl.g:15639:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
+            // InternalMenuDsl.g:15640:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
             {
-            // InternalMenuDsl.g:15509:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
-            // InternalMenuDsl.g:15510:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalMenuDsl.g:15640:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalMenuDsl.g:15641:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionAssignment_3()); 
             }
-            // InternalMenuDsl.g:15511:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
-            // InternalMenuDsl.g:15511:3: rule__XSynchronizedExpression__ExpressionAssignment_3
+            // InternalMenuDsl.g:15642:2: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalMenuDsl.g:15642:3: rule__XSynchronizedExpression__ExpressionAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ExpressionAssignment_3();
@@ -51409,14 +51840,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0"
-    // InternalMenuDsl.g:15520:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
+    // InternalMenuDsl.g:15651: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 {
-            // InternalMenuDsl.g:15524:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
-            // InternalMenuDsl.g:15525:2: rule__XSynchronizedExpression__Group_0__0__Impl
+            // InternalMenuDsl.g:15655:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
+            // InternalMenuDsl.g:15656:2: rule__XSynchronizedExpression__Group_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0__Impl();
@@ -51442,23 +51873,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0__Impl"
-    // InternalMenuDsl.g:15531:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
+    // InternalMenuDsl.g:15662: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 {
-            // InternalMenuDsl.g:15535:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
-            // InternalMenuDsl.g:15536:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalMenuDsl.g:15666:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
+            // InternalMenuDsl.g:15667:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
             {
-            // InternalMenuDsl.g:15536:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
-            // InternalMenuDsl.g:15537:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalMenuDsl.g:15667:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalMenuDsl.g:15668:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0_0()); 
             }
-            // InternalMenuDsl.g:15538:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
-            // InternalMenuDsl.g:15538:3: rule__XSynchronizedExpression__Group_0_0__0
+            // InternalMenuDsl.g:15669:2: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalMenuDsl.g:15669:3: rule__XSynchronizedExpression__Group_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__0();
@@ -51493,16 +51924,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0"
-    // InternalMenuDsl.g:15547:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
+    // InternalMenuDsl.g:15678: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 {
-            // InternalMenuDsl.g:15551:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
-            // InternalMenuDsl.g:15552:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
+            // InternalMenuDsl.g:15682:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
+            // InternalMenuDsl.g:15683:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_103);
+            pushFollow(FOLLOW_106);
             rule__XSynchronizedExpression__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -51531,23 +51962,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0__Impl"
-    // InternalMenuDsl.g:15559:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:15690:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15563:1: ( ( () ) )
-            // InternalMenuDsl.g:15564:1: ( () )
+            // InternalMenuDsl.g:15694:1: ( ( () ) )
+            // InternalMenuDsl.g:15695:1: ( () )
             {
-            // InternalMenuDsl.g:15564:1: ( () )
-            // InternalMenuDsl.g:15565:2: ()
+            // InternalMenuDsl.g:15695:1: ( () )
+            // InternalMenuDsl.g:15696:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getXSynchronizedExpressionAction_0_0_0()); 
             }
-            // InternalMenuDsl.g:15566:2: ()
-            // InternalMenuDsl.g:15566:3: 
+            // InternalMenuDsl.g:15697:2: ()
+            // InternalMenuDsl.g:15697:3: 
             {
             }
 
@@ -51572,16 +52003,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1"
-    // InternalMenuDsl.g:15574:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
+    // InternalMenuDsl.g:15705: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 {
-            // InternalMenuDsl.g:15578:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
-            // InternalMenuDsl.g:15579:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
+            // InternalMenuDsl.g:15709:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
+            // InternalMenuDsl.g:15710:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XSynchronizedExpression__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -51610,22 +52041,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1__Impl"
-    // InternalMenuDsl.g:15586:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
+    // InternalMenuDsl.g:15717: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 {
-            // InternalMenuDsl.g:15590:1: ( ( 'synchronized' ) )
-            // InternalMenuDsl.g:15591:1: ( 'synchronized' )
+            // InternalMenuDsl.g:15721:1: ( ( 'synchronized' ) )
+            // InternalMenuDsl.g:15722:1: ( 'synchronized' )
             {
-            // InternalMenuDsl.g:15591:1: ( 'synchronized' )
-            // InternalMenuDsl.g:15592:2: 'synchronized'
+            // InternalMenuDsl.g:15722:1: ( 'synchronized' )
+            // InternalMenuDsl.g:15723:2: 'synchronized'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
-            match(input,85,FOLLOW_2); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
@@ -51651,14 +52082,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2"
-    // InternalMenuDsl.g:15601:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
+    // InternalMenuDsl.g:15732: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 {
-            // InternalMenuDsl.g:15605:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
-            // InternalMenuDsl.g:15606:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
+            // InternalMenuDsl.g:15736:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
+            // InternalMenuDsl.g:15737:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2__Impl();
@@ -51684,22 +52115,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2__Impl"
-    // InternalMenuDsl.g:15612:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:15743:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15616:1: ( ( '(' ) )
-            // InternalMenuDsl.g:15617:1: ( '(' )
+            // InternalMenuDsl.g:15747:1: ( ( '(' ) )
+            // InternalMenuDsl.g:15748:1: ( '(' )
             {
-            // InternalMenuDsl.g:15617:1: ( '(' )
-            // InternalMenuDsl.g:15618:2: '('
+            // InternalMenuDsl.g:15748:1: ( '(' )
+            // InternalMenuDsl.g:15749:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -51725,16 +52156,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__0"
-    // InternalMenuDsl.g:15628:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
+    // InternalMenuDsl.g:15759: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 {
-            // InternalMenuDsl.g:15632:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
-            // InternalMenuDsl.g:15633:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
+            // InternalMenuDsl.g:15763:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
+            // InternalMenuDsl.g:15764:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__XCatchClause__Group__0__Impl();
 
             state._fsp--;
@@ -51763,25 +52194,25 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__0__Impl"
-    // InternalMenuDsl.g:15640:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
+    // InternalMenuDsl.g:15771:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
     public final void rule__XCatchClause__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15644:1: ( ( ( 'catch' ) ) )
-            // InternalMenuDsl.g:15645:1: ( ( 'catch' ) )
+            // InternalMenuDsl.g:15775:1: ( ( ( 'catch' ) ) )
+            // InternalMenuDsl.g:15776:1: ( ( 'catch' ) )
             {
-            // InternalMenuDsl.g:15645:1: ( ( 'catch' ) )
-            // InternalMenuDsl.g:15646:2: ( 'catch' )
+            // InternalMenuDsl.g:15776:1: ( ( 'catch' ) )
+            // InternalMenuDsl.g:15777:2: ( 'catch' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getCatchKeyword_0()); 
             }
-            // InternalMenuDsl.g:15647:2: ( 'catch' )
-            // InternalMenuDsl.g:15647:3: 'catch'
+            // InternalMenuDsl.g:15778:2: ( 'catch' )
+            // InternalMenuDsl.g:15778:3: 'catch'
             {
-            match(input,86,FOLLOW_2); if (state.failed) return ;
+            match(input,88,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -51810,16 +52241,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__1"
-    // InternalMenuDsl.g:15655:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
+    // InternalMenuDsl.g:15786: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 {
-            // InternalMenuDsl.g:15659:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
-            // InternalMenuDsl.g:15660:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
+            // InternalMenuDsl.g:15790:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
+            // InternalMenuDsl.g:15791:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XCatchClause__Group__1__Impl();
 
             state._fsp--;
@@ -51848,22 +52279,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__1__Impl"
-    // InternalMenuDsl.g:15667:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:15798:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
     public final void rule__XCatchClause__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15671:1: ( ( '(' ) )
-            // InternalMenuDsl.g:15672:1: ( '(' )
+            // InternalMenuDsl.g:15802:1: ( ( '(' ) )
+            // InternalMenuDsl.g:15803:1: ( '(' )
             {
-            // InternalMenuDsl.g:15672:1: ( '(' )
-            // InternalMenuDsl.g:15673:2: '('
+            // InternalMenuDsl.g:15803:1: ( '(' )
+            // InternalMenuDsl.g:15804:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -51889,16 +52320,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__2"
-    // InternalMenuDsl.g:15682:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
+    // InternalMenuDsl.g:15813: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 {
-            // InternalMenuDsl.g:15686:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
-            // InternalMenuDsl.g:15687:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
+            // InternalMenuDsl.g:15817:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
+            // InternalMenuDsl.g:15818:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
             {
-            pushFollow(FOLLOW_72);
+            pushFollow(FOLLOW_75);
             rule__XCatchClause__Group__2__Impl();
 
             state._fsp--;
@@ -51927,23 +52358,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__2__Impl"
-    // InternalMenuDsl.g:15694:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
+    // InternalMenuDsl.g:15825:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
     public final void rule__XCatchClause__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15698:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
-            // InternalMenuDsl.g:15699:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalMenuDsl.g:15829:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
+            // InternalMenuDsl.g:15830:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
             {
-            // InternalMenuDsl.g:15699:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
-            // InternalMenuDsl.g:15700:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalMenuDsl.g:15830:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalMenuDsl.g:15831:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamAssignment_2()); 
             }
-            // InternalMenuDsl.g:15701:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
-            // InternalMenuDsl.g:15701:3: rule__XCatchClause__DeclaredParamAssignment_2
+            // InternalMenuDsl.g:15832:2: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalMenuDsl.g:15832:3: rule__XCatchClause__DeclaredParamAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XCatchClause__DeclaredParamAssignment_2();
@@ -51978,16 +52409,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__3"
-    // InternalMenuDsl.g:15709:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
+    // InternalMenuDsl.g:15840: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 {
-            // InternalMenuDsl.g:15713:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
-            // InternalMenuDsl.g:15714:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
+            // InternalMenuDsl.g:15844:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
+            // InternalMenuDsl.g:15845:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__XCatchClause__Group__3__Impl();
 
             state._fsp--;
@@ -52016,22 +52447,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__3__Impl"
-    // InternalMenuDsl.g:15721:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:15852:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
     public final void rule__XCatchClause__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15725:1: ( ( ')' ) )
-            // InternalMenuDsl.g:15726:1: ( ')' )
+            // InternalMenuDsl.g:15856:1: ( ( ')' ) )
+            // InternalMenuDsl.g:15857:1: ( ')' )
             {
-            // InternalMenuDsl.g:15726:1: ( ')' )
-            // InternalMenuDsl.g:15727:2: ')'
+            // InternalMenuDsl.g:15857:1: ( ')' )
+            // InternalMenuDsl.g:15858:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
@@ -52057,14 +52488,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__4"
-    // InternalMenuDsl.g:15736:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
+    // InternalMenuDsl.g:15867:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
     public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15740:1: ( rule__XCatchClause__Group__4__Impl )
-            // InternalMenuDsl.g:15741:2: rule__XCatchClause__Group__4__Impl
+            // InternalMenuDsl.g:15871:1: ( rule__XCatchClause__Group__4__Impl )
+            // InternalMenuDsl.g:15872:2: rule__XCatchClause__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4__Impl();
@@ -52090,23 +52521,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__Group__4__Impl"
-    // InternalMenuDsl.g:15747:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
+    // InternalMenuDsl.g:15878:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
     public final void rule__XCatchClause__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15751:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
-            // InternalMenuDsl.g:15752:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalMenuDsl.g:15882:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
+            // InternalMenuDsl.g:15883:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
             {
-            // InternalMenuDsl.g:15752:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
-            // InternalMenuDsl.g:15753:2: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalMenuDsl.g:15883:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalMenuDsl.g:15884:2: ( rule__XCatchClause__ExpressionAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionAssignment_4()); 
             }
-            // InternalMenuDsl.g:15754:2: ( rule__XCatchClause__ExpressionAssignment_4 )
-            // InternalMenuDsl.g:15754:3: rule__XCatchClause__ExpressionAssignment_4
+            // InternalMenuDsl.g:15885:2: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalMenuDsl.g:15885:3: rule__XCatchClause__ExpressionAssignment_4
             {
             pushFollow(FOLLOW_2);
             rule__XCatchClause__ExpressionAssignment_4();
@@ -52141,16 +52572,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // InternalMenuDsl.g:15763:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // InternalMenuDsl.g:15894: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 {
-            // InternalMenuDsl.g:15767:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // InternalMenuDsl.g:15768:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // InternalMenuDsl.g:15898:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // InternalMenuDsl.g:15899:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_107);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
@@ -52179,17 +52610,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // InternalMenuDsl.g:15775:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+    // InternalMenuDsl.g:15906:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15779:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:15780:1: ( ruleValidID )
+            // InternalMenuDsl.g:15910:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:15911:1: ( ruleValidID )
             {
-            // InternalMenuDsl.g:15780:1: ( ruleValidID )
-            // InternalMenuDsl.g:15781:2: ruleValidID
+            // InternalMenuDsl.g:15911:1: ( ruleValidID )
+            // InternalMenuDsl.g:15912:2: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
@@ -52224,14 +52655,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // InternalMenuDsl.g:15790:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // InternalMenuDsl.g:15921:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15794:1: ( rule__QualifiedName__Group__1__Impl )
-            // InternalMenuDsl.g:15795:2: rule__QualifiedName__Group__1__Impl
+            // InternalMenuDsl.g:15925:1: ( rule__QualifiedName__Group__1__Impl )
+            // InternalMenuDsl.g:15926:2: rule__QualifiedName__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1__Impl();
@@ -52257,35 +52688,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // InternalMenuDsl.g:15801:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // InternalMenuDsl.g:15932: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 {
-            // InternalMenuDsl.g:15805:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // InternalMenuDsl.g:15806:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalMenuDsl.g:15936:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // InternalMenuDsl.g:15937:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // InternalMenuDsl.g:15806:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // InternalMenuDsl.g:15807:2: ( rule__QualifiedName__Group_1__0 )*
+            // InternalMenuDsl.g:15937:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalMenuDsl.g:15938:2: ( rule__QualifiedName__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:15808:2: ( rule__QualifiedName__Group_1__0 )*
-            loop132:
+            // InternalMenuDsl.g:15939:2: ( rule__QualifiedName__Group_1__0 )*
+            loop130:
             do {
-                int alt132=2;
-                int LA132_0 = input.LA(1);
+                int alt130=2;
+                int LA130_0 = input.LA(1);
 
-                if ( (LA132_0==43) ) {
-                    int LA132_2 = input.LA(2);
+                if ( (LA130_0==43) ) {
+                    int LA130_2 = input.LA(2);
 
-                    if ( (LA132_2==RULE_ID) ) {
-                        int LA132_3 = input.LA(3);
+                    if ( (LA130_2==RULE_ID) ) {
+                        int LA130_3 = input.LA(3);
 
-                        if ( (synpred180_InternalMenuDsl()) ) {
-                            alt132=1;
+                        if ( (synpred179_InternalMenuDsl()) ) {
+                            alt130=1;
                         }
 
 
@@ -52295,11 +52726,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 }
 
 
-                switch (alt132) {
+                switch (alt130) {
             	case 1 :
-            	    // InternalMenuDsl.g:15808:3: rule__QualifiedName__Group_1__0
+            	    // InternalMenuDsl.g:15939:3: rule__QualifiedName__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_105);
+            	    pushFollow(FOLLOW_108);
             	    rule__QualifiedName__Group_1__0();
 
             	    state._fsp--;
@@ -52309,7 +52740,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop132;
+            	    break loop130;
                 }
             } while (true);
 
@@ -52338,16 +52769,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // InternalMenuDsl.g:15817:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalMenuDsl.g:15948: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 {
-            // InternalMenuDsl.g:15821:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // InternalMenuDsl.g:15822:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalMenuDsl.g:15952:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalMenuDsl.g:15953:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
@@ -52376,23 +52807,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // InternalMenuDsl.g:15829:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+    // InternalMenuDsl.g:15960:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15833:1: ( ( ( '.' ) ) )
-            // InternalMenuDsl.g:15834:1: ( ( '.' ) )
+            // InternalMenuDsl.g:15964:1: ( ( ( '.' ) ) )
+            // InternalMenuDsl.g:15965:1: ( ( '.' ) )
             {
-            // InternalMenuDsl.g:15834:1: ( ( '.' ) )
-            // InternalMenuDsl.g:15835:2: ( '.' )
+            // InternalMenuDsl.g:15965:1: ( ( '.' ) )
+            // InternalMenuDsl.g:15966:2: ( '.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
             }
-            // InternalMenuDsl.g:15836:2: ( '.' )
-            // InternalMenuDsl.g:15836:3: '.'
+            // InternalMenuDsl.g:15967:2: ( '.' )
+            // InternalMenuDsl.g:15967:3: '.'
             {
             match(input,43,FOLLOW_2); if (state.failed) return ;
 
@@ -52423,14 +52854,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // InternalMenuDsl.g:15844:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // InternalMenuDsl.g:15975: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 {
-            // InternalMenuDsl.g:15848:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // InternalMenuDsl.g:15849:2: rule__QualifiedName__Group_1__1__Impl
+            // InternalMenuDsl.g:15979:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // InternalMenuDsl.g:15980:2: rule__QualifiedName__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1__Impl();
@@ -52456,17 +52887,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // InternalMenuDsl.g:15855:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+    // InternalMenuDsl.g:15986:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15859:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:15860:1: ( ruleValidID )
+            // InternalMenuDsl.g:15990:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:15991:1: ( ruleValidID )
             {
-            // InternalMenuDsl.g:15860:1: ( ruleValidID )
-            // InternalMenuDsl.g:15861:2: ruleValidID
+            // InternalMenuDsl.g:15991:1: ( ruleValidID )
+            // InternalMenuDsl.g:15992:2: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
@@ -52501,16 +52932,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1__0"
-    // InternalMenuDsl.g:15871:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
+    // InternalMenuDsl.g:16002: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 {
-            // InternalMenuDsl.g:15875:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
-            // InternalMenuDsl.g:15876:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
+            // InternalMenuDsl.g:16006:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
+            // InternalMenuDsl.g:16007:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_107);
             rule__Number__Group_1__0__Impl();
 
             state._fsp--;
@@ -52539,23 +52970,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1__0__Impl"
-    // InternalMenuDsl.g:15883:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
+    // InternalMenuDsl.g:16014: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 {
-            // InternalMenuDsl.g:15887:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
-            // InternalMenuDsl.g:15888:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalMenuDsl.g:16018:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
+            // InternalMenuDsl.g:16019:1: ( ( rule__Number__Alternatives_1_0 ) )
             {
-            // InternalMenuDsl.g:15888:1: ( ( rule__Number__Alternatives_1_0 ) )
-            // InternalMenuDsl.g:15889:2: ( rule__Number__Alternatives_1_0 )
+            // InternalMenuDsl.g:16019:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalMenuDsl.g:16020:2: ( rule__Number__Alternatives_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_0()); 
             }
-            // InternalMenuDsl.g:15890:2: ( rule__Number__Alternatives_1_0 )
-            // InternalMenuDsl.g:15890:3: rule__Number__Alternatives_1_0
+            // InternalMenuDsl.g:16021:2: ( rule__Number__Alternatives_1_0 )
+            // InternalMenuDsl.g:16021:3: rule__Number__Alternatives_1_0
             {
             pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_0();
@@ -52590,14 +53021,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1__1"
-    // InternalMenuDsl.g:15898:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
+    // InternalMenuDsl.g:16029: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 {
-            // InternalMenuDsl.g:15902:1: ( rule__Number__Group_1__1__Impl )
-            // InternalMenuDsl.g:15903:2: rule__Number__Group_1__1__Impl
+            // InternalMenuDsl.g:16033:1: ( rule__Number__Group_1__1__Impl )
+            // InternalMenuDsl.g:16034:2: rule__Number__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Number__Group_1__1__Impl();
@@ -52623,35 +53054,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1__1__Impl"
-    // InternalMenuDsl.g:15909:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
+    // InternalMenuDsl.g:16040: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 {
-            // InternalMenuDsl.g:15913:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
-            // InternalMenuDsl.g:15914:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalMenuDsl.g:16044:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
+            // InternalMenuDsl.g:16045:1: ( ( rule__Number__Group_1_1__0 )? )
             {
-            // InternalMenuDsl.g:15914:1: ( ( rule__Number__Group_1_1__0 )? )
-            // InternalMenuDsl.g:15915:2: ( rule__Number__Group_1_1__0 )?
+            // InternalMenuDsl.g:16045:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalMenuDsl.g:16046:2: ( rule__Number__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getGroup_1_1()); 
             }
-            // InternalMenuDsl.g:15916:2: ( rule__Number__Group_1_1__0 )?
-            int alt133=2;
-            int LA133_0 = input.LA(1);
+            // InternalMenuDsl.g:16047:2: ( rule__Number__Group_1_1__0 )?
+            int alt131=2;
+            int LA131_0 = input.LA(1);
 
-            if ( (LA133_0==43) ) {
-                int LA133_1 = input.LA(2);
+            if ( (LA131_0==43) ) {
+                int LA131_1 = input.LA(2);
 
-                if ( ((LA133_1>=RULE_INT && LA133_1<=RULE_DECIMAL)) ) {
-                    alt133=1;
+                if ( ((LA131_1>=RULE_INT && LA131_1<=RULE_DECIMAL)) ) {
+                    alt131=1;
                 }
             }
-            switch (alt133) {
+            switch (alt131) {
                 case 1 :
-                    // InternalMenuDsl.g:15916:3: rule__Number__Group_1_1__0
+                    // InternalMenuDsl.g:16047:3: rule__Number__Group_1_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Number__Group_1_1__0();
@@ -52689,16 +53120,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0"
-    // InternalMenuDsl.g:15925:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
+    // InternalMenuDsl.g:16056: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 {
-            // InternalMenuDsl.g:15929:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
-            // InternalMenuDsl.g:15930:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
+            // InternalMenuDsl.g:16060:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
+            // InternalMenuDsl.g:16061:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
             {
-            pushFollow(FOLLOW_106);
+            pushFollow(FOLLOW_109);
             rule__Number__Group_1_1__0__Impl();
 
             state._fsp--;
@@ -52727,17 +53158,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0__Impl"
-    // InternalMenuDsl.g:15937:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
+    // InternalMenuDsl.g:16068:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
     public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15941:1: ( ( '.' ) )
-            // InternalMenuDsl.g:15942:1: ( '.' )
+            // InternalMenuDsl.g:16072:1: ( ( '.' ) )
+            // InternalMenuDsl.g:16073:1: ( '.' )
             {
-            // InternalMenuDsl.g:15942:1: ( '.' )
-            // InternalMenuDsl.g:15943:2: '.'
+            // InternalMenuDsl.g:16073:1: ( '.' )
+            // InternalMenuDsl.g:16074:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
@@ -52768,14 +53199,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1_1__1"
-    // InternalMenuDsl.g:15952:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
+    // InternalMenuDsl.g:16083: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 {
-            // InternalMenuDsl.g:15956:1: ( rule__Number__Group_1_1__1__Impl )
-            // InternalMenuDsl.g:15957:2: rule__Number__Group_1_1__1__Impl
+            // InternalMenuDsl.g:16087:1: ( rule__Number__Group_1_1__1__Impl )
+            // InternalMenuDsl.g:16088:2: rule__Number__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1__Impl();
@@ -52801,23 +53232,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Number__Group_1_1__1__Impl"
-    // InternalMenuDsl.g:15963:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
+    // InternalMenuDsl.g:16094: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 {
-            // InternalMenuDsl.g:15967:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
-            // InternalMenuDsl.g:15968:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalMenuDsl.g:16098:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
+            // InternalMenuDsl.g:16099:1: ( ( rule__Number__Alternatives_1_1_1 ) )
             {
-            // InternalMenuDsl.g:15968:1: ( ( rule__Number__Alternatives_1_1_1 ) )
-            // InternalMenuDsl.g:15969:2: ( rule__Number__Alternatives_1_1_1 )
+            // InternalMenuDsl.g:16099:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalMenuDsl.g:16100:2: ( rule__Number__Alternatives_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_1_1()); 
             }
-            // InternalMenuDsl.g:15970:2: ( rule__Number__Alternatives_1_1_1 )
-            // InternalMenuDsl.g:15970:3: rule__Number__Alternatives_1_1_1
+            // InternalMenuDsl.g:16101:2: ( rule__Number__Alternatives_1_1_1 )
+            // InternalMenuDsl.g:16101:3: rule__Number__Alternatives_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_1_1();
@@ -52852,16 +53283,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0"
-    // InternalMenuDsl.g:15979:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
+    // InternalMenuDsl.g:16110: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 {
-            // InternalMenuDsl.g:15983:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
-            // InternalMenuDsl.g:15984:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
+            // InternalMenuDsl.g:16114:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
+            // InternalMenuDsl.g:16115:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__JvmTypeReference__Group_0__0__Impl();
 
             state._fsp--;
@@ -52890,17 +53321,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0__Impl"
-    // InternalMenuDsl.g:15991:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
+    // InternalMenuDsl.g:16122:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:15995:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // InternalMenuDsl.g:15996:1: ( ruleJvmParameterizedTypeReference )
+            // InternalMenuDsl.g:16126:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // InternalMenuDsl.g:16127:1: ( ruleJvmParameterizedTypeReference )
             {
-            // InternalMenuDsl.g:15996:1: ( ruleJvmParameterizedTypeReference )
-            // InternalMenuDsl.g:15997:2: ruleJvmParameterizedTypeReference
+            // InternalMenuDsl.g:16127:1: ( ruleJvmParameterizedTypeReference )
+            // InternalMenuDsl.g:16128:2: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
@@ -52935,14 +53366,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1"
-    // InternalMenuDsl.g:16006:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
+    // InternalMenuDsl.g:16137: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 {
-            // InternalMenuDsl.g:16010:1: ( rule__JvmTypeReference__Group_0__1__Impl )
-            // InternalMenuDsl.g:16011:2: rule__JvmTypeReference__Group_0__1__Impl
+            // InternalMenuDsl.g:16141:1: ( rule__JvmTypeReference__Group_0__1__Impl )
+            // InternalMenuDsl.g:16142:2: rule__JvmTypeReference__Group_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1__Impl();
@@ -52968,35 +53399,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1__Impl"
-    // InternalMenuDsl.g:16017:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
+    // InternalMenuDsl.g:16148: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 {
-            // InternalMenuDsl.g:16021:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
-            // InternalMenuDsl.g:16022:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalMenuDsl.g:16152:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
+            // InternalMenuDsl.g:16153:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
             {
-            // InternalMenuDsl.g:16022:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
-            // InternalMenuDsl.g:16023:2: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalMenuDsl.g:16153:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalMenuDsl.g:16154:2: ( rule__JvmTypeReference__Group_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1()); 
             }
-            // InternalMenuDsl.g:16024:2: ( rule__JvmTypeReference__Group_0_1__0 )*
-            loop134:
+            // InternalMenuDsl.g:16155:2: ( rule__JvmTypeReference__Group_0_1__0 )*
+            loop132:
             do {
-                int alt134=2;
-                int LA134_0 = input.LA(1);
+                int alt132=2;
+                int LA132_0 = input.LA(1);
 
-                if ( (LA134_0==66) ) {
-                    int LA134_2 = input.LA(2);
+                if ( (LA132_0==68) ) {
+                    int LA132_2 = input.LA(2);
 
-                    if ( (LA134_2==64) ) {
-                        int LA134_3 = input.LA(3);
+                    if ( (LA132_2==66) ) {
+                        int LA132_3 = input.LA(3);
 
-                        if ( (synpred182_InternalMenuDsl()) ) {
-                            alt134=1;
+                        if ( (synpred181_InternalMenuDsl()) ) {
+                            alt132=1;
                         }
 
 
@@ -53006,11 +53437,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 }
 
 
-                switch (alt134) {
+                switch (alt132) {
             	case 1 :
-            	    // InternalMenuDsl.g:16024:3: rule__JvmTypeReference__Group_0_1__0
+            	    // InternalMenuDsl.g:16155:3: rule__JvmTypeReference__Group_0_1__0
             	    {
-            	    pushFollow(FOLLOW_96);
+            	    pushFollow(FOLLOW_99);
             	    rule__JvmTypeReference__Group_0_1__0();
 
             	    state._fsp--;
@@ -53020,7 +53451,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop134;
+            	    break loop132;
                 }
             } while (true);
 
@@ -53049,14 +53480,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0"
-    // InternalMenuDsl.g:16033:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
+    // InternalMenuDsl.g:16164: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 {
-            // InternalMenuDsl.g:16037:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
-            // InternalMenuDsl.g:16038:2: rule__JvmTypeReference__Group_0_1__0__Impl
+            // InternalMenuDsl.g:16168:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
+            // InternalMenuDsl.g:16169:2: rule__JvmTypeReference__Group_0_1__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1__0__Impl();
@@ -53082,23 +53513,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0__Impl"
-    // InternalMenuDsl.g:16044:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
+    // InternalMenuDsl.g:16175: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 {
-            // InternalMenuDsl.g:16048:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
-            // InternalMenuDsl.g:16049:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalMenuDsl.g:16179:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
+            // InternalMenuDsl.g:16180:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
             {
-            // InternalMenuDsl.g:16049:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
-            // InternalMenuDsl.g:16050:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalMenuDsl.g:16180:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalMenuDsl.g:16181:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1_0()); 
             }
-            // InternalMenuDsl.g:16051:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
-            // InternalMenuDsl.g:16051:3: rule__JvmTypeReference__Group_0_1_0__0
+            // InternalMenuDsl.g:16182:2: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalMenuDsl.g:16182:3: rule__JvmTypeReference__Group_0_1_0__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__0();
@@ -53133,16 +53564,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0"
-    // InternalMenuDsl.g:16060:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
+    // InternalMenuDsl.g:16191: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 {
-            // InternalMenuDsl.g:16064:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
-            // InternalMenuDsl.g:16065:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
+            // InternalMenuDsl.g:16195:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
+            // InternalMenuDsl.g:16196:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__JvmTypeReference__Group_0_1_0__0__Impl();
 
             state._fsp--;
@@ -53171,23 +53602,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0__Impl"
-    // InternalMenuDsl.g:16072:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:16203: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 {
-            // InternalMenuDsl.g:16076:1: ( ( () ) )
-            // InternalMenuDsl.g:16077:1: ( () )
+            // InternalMenuDsl.g:16207:1: ( ( () ) )
+            // InternalMenuDsl.g:16208:1: ( () )
             {
-            // InternalMenuDsl.g:16077:1: ( () )
-            // InternalMenuDsl.g:16078:2: ()
+            // InternalMenuDsl.g:16208:1: ( () )
+            // InternalMenuDsl.g:16209:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()); 
             }
-            // InternalMenuDsl.g:16079:2: ()
-            // InternalMenuDsl.g:16079:3: 
+            // InternalMenuDsl.g:16210:2: ()
+            // InternalMenuDsl.g:16210:3: 
             {
             }
 
@@ -53212,14 +53643,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1"
-    // InternalMenuDsl.g:16087:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
+    // InternalMenuDsl.g:16218: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 {
-            // InternalMenuDsl.g:16091:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
-            // InternalMenuDsl.g:16092:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
+            // InternalMenuDsl.g:16222:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
+            // InternalMenuDsl.g:16223:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1__Impl();
@@ -53245,17 +53676,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1__Impl"
-    // InternalMenuDsl.g:16098:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
+    // InternalMenuDsl.g:16229: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 {
-            // InternalMenuDsl.g:16102:1: ( ( ruleArrayBrackets ) )
-            // InternalMenuDsl.g:16103:1: ( ruleArrayBrackets )
+            // InternalMenuDsl.g:16233:1: ( ( ruleArrayBrackets ) )
+            // InternalMenuDsl.g:16234:1: ( ruleArrayBrackets )
             {
-            // InternalMenuDsl.g:16103:1: ( ruleArrayBrackets )
-            // InternalMenuDsl.g:16104:2: ruleArrayBrackets
+            // InternalMenuDsl.g:16234:1: ( ruleArrayBrackets )
+            // InternalMenuDsl.g:16235:2: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
@@ -53290,16 +53721,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0"
-    // InternalMenuDsl.g:16114:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
+    // InternalMenuDsl.g:16245: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 {
-            // InternalMenuDsl.g:16118:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
-            // InternalMenuDsl.g:16119:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
+            // InternalMenuDsl.g:16249:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
+            // InternalMenuDsl.g:16250:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
             {
-            pushFollow(FOLLOW_69);
+            pushFollow(FOLLOW_72);
             rule__ArrayBrackets__Group__0__Impl();
 
             state._fsp--;
@@ -53328,22 +53759,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0__Impl"
-    // InternalMenuDsl.g:16126:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
+    // InternalMenuDsl.g:16257:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
     public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16130:1: ( ( '[' ) )
-            // InternalMenuDsl.g:16131:1: ( '[' )
+            // InternalMenuDsl.g:16261:1: ( ( '[' ) )
+            // InternalMenuDsl.g:16262:1: ( '[' )
             {
-            // InternalMenuDsl.g:16131:1: ( '[' )
-            // InternalMenuDsl.g:16132:2: '['
+            // InternalMenuDsl.g:16262:1: ( '[' )
+            // InternalMenuDsl.g:16263:2: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
-            match(input,66,FOLLOW_2); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
@@ -53369,14 +53800,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1"
-    // InternalMenuDsl.g:16141:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
+    // InternalMenuDsl.g:16272:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
     public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16145:1: ( rule__ArrayBrackets__Group__1__Impl )
-            // InternalMenuDsl.g:16146:2: rule__ArrayBrackets__Group__1__Impl
+            // InternalMenuDsl.g:16276:1: ( rule__ArrayBrackets__Group__1__Impl )
+            // InternalMenuDsl.g:16277:2: rule__ArrayBrackets__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1__Impl();
@@ -53402,22 +53833,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1__Impl"
-    // InternalMenuDsl.g:16152:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
+    // InternalMenuDsl.g:16283:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
     public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16156:1: ( ( ']' ) )
-            // InternalMenuDsl.g:16157:1: ( ']' )
+            // InternalMenuDsl.g:16287:1: ( ( ']' ) )
+            // InternalMenuDsl.g:16288:1: ( ']' )
             {
-            // InternalMenuDsl.g:16157:1: ( ']' )
-            // InternalMenuDsl.g:16158:2: ']'
+            // InternalMenuDsl.g:16288:1: ( ']' )
+            // InternalMenuDsl.g:16289:2: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
-            match(input,64,FOLLOW_2); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
@@ -53443,16 +53874,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0"
-    // InternalMenuDsl.g:16168:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
+    // InternalMenuDsl.g:16299: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 {
-            // InternalMenuDsl.g:16172:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
-            // InternalMenuDsl.g:16173:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
+            // InternalMenuDsl.g:16303:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
+            // InternalMenuDsl.g:16304:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XFunctionTypeRef__Group__0__Impl();
 
             state._fsp--;
@@ -53481,31 +53912,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0__Impl"
-    // InternalMenuDsl.g:16180:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
+    // InternalMenuDsl.g:16311: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 {
-            // InternalMenuDsl.g:16184:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
-            // InternalMenuDsl.g:16185:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalMenuDsl.g:16315:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
+            // InternalMenuDsl.g:16316:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
             {
-            // InternalMenuDsl.g:16185:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
-            // InternalMenuDsl.g:16186:2: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalMenuDsl.g:16316:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalMenuDsl.g:16317:2: ( rule__XFunctionTypeRef__Group_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0()); 
             }
-            // InternalMenuDsl.g:16187:2: ( rule__XFunctionTypeRef__Group_0__0 )?
-            int alt135=2;
-            int LA135_0 = input.LA(1);
+            // InternalMenuDsl.g:16318:2: ( rule__XFunctionTypeRef__Group_0__0 )?
+            int alt133=2;
+            int LA133_0 = input.LA(1);
 
-            if ( (LA135_0==61) ) {
-                alt135=1;
+            if ( (LA133_0==63) ) {
+                alt133=1;
             }
-            switch (alt135) {
+            switch (alt133) {
                 case 1 :
-                    // InternalMenuDsl.g:16187:3: rule__XFunctionTypeRef__Group_0__0
+                    // InternalMenuDsl.g:16318:3: rule__XFunctionTypeRef__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0__0();
@@ -53543,16 +53974,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1"
-    // InternalMenuDsl.g:16195:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
+    // InternalMenuDsl.g:16326: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 {
-            // InternalMenuDsl.g:16199:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
-            // InternalMenuDsl.g:16200:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
+            // InternalMenuDsl.g:16330:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
+            // InternalMenuDsl.g:16331:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XFunctionTypeRef__Group__1__Impl();
 
             state._fsp--;
@@ -53581,17 +54012,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1__Impl"
-    // InternalMenuDsl.g:16207:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
+    // InternalMenuDsl.g:16338:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
     public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16211:1: ( ( '=>' ) )
-            // InternalMenuDsl.g:16212:1: ( '=>' )
+            // InternalMenuDsl.g:16342:1: ( ( '=>' ) )
+            // InternalMenuDsl.g:16343:1: ( '=>' )
             {
-            // InternalMenuDsl.g:16212:1: ( '=>' )
-            // InternalMenuDsl.g:16213:2: '=>'
+            // InternalMenuDsl.g:16343:1: ( '=>' )
+            // InternalMenuDsl.g:16344:2: '=>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
@@ -53622,14 +54053,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2"
-    // InternalMenuDsl.g:16222:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
+    // InternalMenuDsl.g:16353:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
     public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16226:1: ( rule__XFunctionTypeRef__Group__2__Impl )
-            // InternalMenuDsl.g:16227:2: rule__XFunctionTypeRef__Group__2__Impl
+            // InternalMenuDsl.g:16357:1: ( rule__XFunctionTypeRef__Group__2__Impl )
+            // InternalMenuDsl.g:16358:2: rule__XFunctionTypeRef__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2__Impl();
@@ -53655,23 +54086,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2__Impl"
-    // InternalMenuDsl.g:16233:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
+    // InternalMenuDsl.g:16364:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
     public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16237:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
-            // InternalMenuDsl.g:16238:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalMenuDsl.g:16368:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
+            // InternalMenuDsl.g:16369:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
             {
-            // InternalMenuDsl.g:16238:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
-            // InternalMenuDsl.g:16239:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalMenuDsl.g:16369:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalMenuDsl.g:16370:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeAssignment_2()); 
             }
-            // InternalMenuDsl.g:16240:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
-            // InternalMenuDsl.g:16240:3: rule__XFunctionTypeRef__ReturnTypeAssignment_2
+            // InternalMenuDsl.g:16371:2: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalMenuDsl.g:16371:3: rule__XFunctionTypeRef__ReturnTypeAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ReturnTypeAssignment_2();
@@ -53706,16 +54137,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0"
-    // InternalMenuDsl.g:16249:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
+    // InternalMenuDsl.g:16380: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 {
-            // InternalMenuDsl.g:16253:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
-            // InternalMenuDsl.g:16254:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
+            // InternalMenuDsl.g:16384:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
+            // InternalMenuDsl.g:16385:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
             {
-            pushFollow(FOLLOW_107);
+            pushFollow(FOLLOW_110);
             rule__XFunctionTypeRef__Group_0__0__Impl();
 
             state._fsp--;
@@ -53744,22 +54175,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0__Impl"
-    // InternalMenuDsl.g:16261:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
+    // InternalMenuDsl.g:16392:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
     public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16265:1: ( ( '(' ) )
-            // InternalMenuDsl.g:16266:1: ( '(' )
+            // InternalMenuDsl.g:16396:1: ( ( '(' ) )
+            // InternalMenuDsl.g:16397:1: ( '(' )
             {
-            // InternalMenuDsl.g:16266:1: ( '(' )
-            // InternalMenuDsl.g:16267:2: '('
+            // InternalMenuDsl.g:16397:1: ( '(' )
+            // InternalMenuDsl.g:16398:2: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
@@ -53785,16 +54216,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1"
-    // InternalMenuDsl.g:16276:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
+    // InternalMenuDsl.g:16407: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 {
-            // InternalMenuDsl.g:16280:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
-            // InternalMenuDsl.g:16281:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
+            // InternalMenuDsl.g:16411:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
+            // InternalMenuDsl.g:16412:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
             {
-            pushFollow(FOLLOW_107);
+            pushFollow(FOLLOW_110);
             rule__XFunctionTypeRef__Group_0__1__Impl();
 
             state._fsp--;
@@ -53823,31 +54254,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1__Impl"
-    // InternalMenuDsl.g:16288:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
+    // InternalMenuDsl.g:16419: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 {
-            // InternalMenuDsl.g:16292:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
-            // InternalMenuDsl.g:16293:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalMenuDsl.g:16423:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
+            // InternalMenuDsl.g:16424:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
             {
-            // InternalMenuDsl.g:16293:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
-            // InternalMenuDsl.g:16294:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalMenuDsl.g:16424:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalMenuDsl.g:16425:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1()); 
             }
-            // InternalMenuDsl.g:16295:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
-            int alt136=2;
-            int LA136_0 = input.LA(1);
+            // InternalMenuDsl.g:16426:2: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            int alt134=2;
+            int LA134_0 = input.LA(1);
 
-            if ( (LA136_0==RULE_ID||LA136_0==31||LA136_0==61) ) {
-                alt136=1;
+            if ( (LA134_0==RULE_ID||LA134_0==31||LA134_0==63) ) {
+                alt134=1;
             }
-            switch (alt136) {
+            switch (alt134) {
                 case 1 :
-                    // InternalMenuDsl.g:16295:3: rule__XFunctionTypeRef__Group_0_1__0
+                    // InternalMenuDsl.g:16426:3: rule__XFunctionTypeRef__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0_1__0();
@@ -53885,14 +54316,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2"
-    // InternalMenuDsl.g:16303:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
+    // InternalMenuDsl.g:16434: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 {
-            // InternalMenuDsl.g:16307:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
-            // InternalMenuDsl.g:16308:2: rule__XFunctionTypeRef__Group_0__2__Impl
+            // InternalMenuDsl.g:16438:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
+            // InternalMenuDsl.g:16439:2: rule__XFunctionTypeRef__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2__Impl();
@@ -53918,22 +54349,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2__Impl"
-    // InternalMenuDsl.g:16314:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
+    // InternalMenuDsl.g:16445:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
     public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16318:1: ( ( ')' ) )
-            // InternalMenuDsl.g:16319:1: ( ')' )
+            // InternalMenuDsl.g:16449:1: ( ( ')' ) )
+            // InternalMenuDsl.g:16450:1: ( ')' )
             {
-            // InternalMenuDsl.g:16319:1: ( ')' )
-            // InternalMenuDsl.g:16320:2: ')'
+            // InternalMenuDsl.g:16450:1: ( ')' )
+            // InternalMenuDsl.g:16451:2: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
-            match(input,62,FOLLOW_2); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
@@ -53959,16 +54390,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0"
-    // InternalMenuDsl.g:16330:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
+    // InternalMenuDsl.g:16461: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 {
-            // InternalMenuDsl.g:16334:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
-            // InternalMenuDsl.g:16335:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
+            // InternalMenuDsl.g:16465:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
+            // InternalMenuDsl.g:16466:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__XFunctionTypeRef__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -53997,23 +54428,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0__Impl"
-    // InternalMenuDsl.g:16342:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
+    // InternalMenuDsl.g:16473: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 {
-            // InternalMenuDsl.g:16346:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
-            // InternalMenuDsl.g:16347:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalMenuDsl.g:16477:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
+            // InternalMenuDsl.g:16478:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
             {
-            // InternalMenuDsl.g:16347:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
-            // InternalMenuDsl.g:16348:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalMenuDsl.g:16478:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalMenuDsl.g:16479:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_0()); 
             }
-            // InternalMenuDsl.g:16349:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
-            // InternalMenuDsl.g:16349:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
+            // InternalMenuDsl.g:16480:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalMenuDsl.g:16480:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0();
@@ -54048,14 +54479,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1"
-    // InternalMenuDsl.g:16357:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
+    // InternalMenuDsl.g:16488: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 {
-            // InternalMenuDsl.g:16361:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
-            // InternalMenuDsl.g:16362:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
+            // InternalMenuDsl.g:16492:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
+            // InternalMenuDsl.g:16493:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1__Impl();
@@ -54081,37 +54512,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1__Impl"
-    // InternalMenuDsl.g:16368:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
+    // InternalMenuDsl.g:16499: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 {
-            // InternalMenuDsl.g:16372:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
-            // InternalMenuDsl.g:16373:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalMenuDsl.g:16503:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
+            // InternalMenuDsl.g:16504:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
             {
-            // InternalMenuDsl.g:16373:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
-            // InternalMenuDsl.g:16374:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalMenuDsl.g:16504:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalMenuDsl.g:16505:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1_1()); 
             }
-            // InternalMenuDsl.g:16375:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
-            loop137:
+            // InternalMenuDsl.g:16506:2: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            loop135:
             do {
-                int alt137=2;
-                int LA137_0 = input.LA(1);
+                int alt135=2;
+                int LA135_0 = input.LA(1);
 
-                if ( (LA137_0==63) ) {
-                    alt137=1;
+                if ( (LA135_0==65) ) {
+                    alt135=1;
                 }
 
 
-                switch (alt137) {
+                switch (alt135) {
             	case 1 :
-            	    // InternalMenuDsl.g:16375:3: rule__XFunctionTypeRef__Group_0_1_1__0
+            	    // InternalMenuDsl.g:16506:3: rule__XFunctionTypeRef__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__XFunctionTypeRef__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -54121,7 +54552,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop137;
+            	    break loop135;
                 }
             } while (true);
 
@@ -54150,16 +54581,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0"
-    // InternalMenuDsl.g:16384:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
+    // InternalMenuDsl.g:16515: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 {
-            // InternalMenuDsl.g:16388:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
-            // InternalMenuDsl.g:16389:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
+            // InternalMenuDsl.g:16519:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
+            // InternalMenuDsl.g:16520:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__XFunctionTypeRef__Group_0_1_1__0__Impl();
 
             state._fsp--;
@@ -54188,22 +54619,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0__Impl"
-    // InternalMenuDsl.g:16396:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:16527: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 {
-            // InternalMenuDsl.g:16400:1: ( ( ',' ) )
-            // InternalMenuDsl.g:16401:1: ( ',' )
+            // InternalMenuDsl.g:16531:1: ( ( ',' ) )
+            // InternalMenuDsl.g:16532:1: ( ',' )
             {
-            // InternalMenuDsl.g:16401:1: ( ',' )
-            // InternalMenuDsl.g:16402:2: ','
+            // InternalMenuDsl.g:16532:1: ( ',' )
+            // InternalMenuDsl.g:16533:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -54229,14 +54660,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1"
-    // InternalMenuDsl.g:16411:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
+    // InternalMenuDsl.g:16542: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 {
-            // InternalMenuDsl.g:16415:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
-            // InternalMenuDsl.g:16416:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
+            // InternalMenuDsl.g:16546:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
+            // InternalMenuDsl.g:16547:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1__Impl();
@@ -54262,23 +54693,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1__Impl"
-    // InternalMenuDsl.g:16422:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
+    // InternalMenuDsl.g:16553: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 {
-            // InternalMenuDsl.g:16426:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
-            // InternalMenuDsl.g:16427:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalMenuDsl.g:16557:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
+            // InternalMenuDsl.g:16558:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
             {
-            // InternalMenuDsl.g:16427:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
-            // InternalMenuDsl.g:16428:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalMenuDsl.g:16558:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalMenuDsl.g:16559:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_1_1()); 
             }
-            // InternalMenuDsl.g:16429:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
-            // InternalMenuDsl.g:16429:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
+            // InternalMenuDsl.g:16560:2: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalMenuDsl.g:16560:3: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1();
@@ -54313,16 +54744,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0"
-    // InternalMenuDsl.g:16438:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
+    // InternalMenuDsl.g:16569: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 {
-            // InternalMenuDsl.g:16442:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
-            // InternalMenuDsl.g:16443:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
+            // InternalMenuDsl.g:16573:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
+            // InternalMenuDsl.g:16574:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
             {
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_36);
             rule__JvmParameterizedTypeReference__Group__0__Impl();
 
             state._fsp--;
@@ -54351,23 +54782,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0__Impl"
-    // InternalMenuDsl.g:16450:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
+    // InternalMenuDsl.g:16581:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16454:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
-            // InternalMenuDsl.g:16455:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalMenuDsl.g:16585:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
+            // InternalMenuDsl.g:16586:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
             {
-            // InternalMenuDsl.g:16455:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
-            // InternalMenuDsl.g:16456:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalMenuDsl.g:16586:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalMenuDsl.g:16587:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_0()); 
             }
-            // InternalMenuDsl.g:16457:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
-            // InternalMenuDsl.g:16457:3: rule__JvmParameterizedTypeReference__TypeAssignment_0
+            // InternalMenuDsl.g:16588:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalMenuDsl.g:16588:3: rule__JvmParameterizedTypeReference__TypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_0();
@@ -54402,14 +54833,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1"
-    // InternalMenuDsl.g:16465:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
+    // InternalMenuDsl.g:16596:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16469:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
-            // InternalMenuDsl.g:16470:2: rule__JvmParameterizedTypeReference__Group__1__Impl
+            // InternalMenuDsl.g:16600:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
+            // InternalMenuDsl.g:16601:2: rule__JvmParameterizedTypeReference__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1__Impl();
@@ -54435,27 +54866,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1__Impl"
-    // InternalMenuDsl.g:16476:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
+    // InternalMenuDsl.g:16607: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 {
-            // InternalMenuDsl.g:16480:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
-            // InternalMenuDsl.g:16481:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalMenuDsl.g:16611:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
+            // InternalMenuDsl.g:16612:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
             {
-            // InternalMenuDsl.g:16481:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
-            // InternalMenuDsl.g:16482:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalMenuDsl.g:16612:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalMenuDsl.g:16613:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1()); 
             }
-            // InternalMenuDsl.g:16483:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
-            int alt138=2;
-            alt138 = dfa138.predict(input);
-            switch (alt138) {
+            // InternalMenuDsl.g:16614:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            int alt136=2;
+            alt136 = dfa136.predict(input);
+            switch (alt136) {
                 case 1 :
-                    // InternalMenuDsl.g:16483:3: rule__JvmParameterizedTypeReference__Group_1__0
+                    // InternalMenuDsl.g:16614:3: rule__JvmParameterizedTypeReference__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1__0();
@@ -54493,16 +54924,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0"
-    // InternalMenuDsl.g:16492:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
+    // InternalMenuDsl.g:16623: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 {
-            // InternalMenuDsl.g:16496:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
-            // InternalMenuDsl.g:16497:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
+            // InternalMenuDsl.g:16627:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
+            // InternalMenuDsl.g:16628:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__JvmParameterizedTypeReference__Group_1__0__Impl();
 
             state._fsp--;
@@ -54531,23 +54962,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0__Impl"
-    // InternalMenuDsl.g:16504:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
+    // InternalMenuDsl.g:16635:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16508:1: ( ( ( '<' ) ) )
-            // InternalMenuDsl.g:16509:1: ( ( '<' ) )
+            // InternalMenuDsl.g:16639:1: ( ( ( '<' ) ) )
+            // InternalMenuDsl.g:16640:1: ( ( '<' ) )
             {
-            // InternalMenuDsl.g:16509:1: ( ( '<' ) )
-            // InternalMenuDsl.g:16510:2: ( '<' )
+            // InternalMenuDsl.g:16640:1: ( ( '<' ) )
+            // InternalMenuDsl.g:16641:2: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0()); 
             }
-            // InternalMenuDsl.g:16511:2: ( '<' )
-            // InternalMenuDsl.g:16511:3: '<'
+            // InternalMenuDsl.g:16642:2: ( '<' )
+            // InternalMenuDsl.g:16642:3: '<'
             {
             match(input,27,FOLLOW_2); if (state.failed) return ;
 
@@ -54578,16 +55009,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1"
-    // InternalMenuDsl.g:16519:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
+    // InternalMenuDsl.g:16650: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 {
-            // InternalMenuDsl.g:16523:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
-            // InternalMenuDsl.g:16524:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
+            // InternalMenuDsl.g:16654:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
+            // InternalMenuDsl.g:16655:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__JvmParameterizedTypeReference__Group_1__1__Impl();
 
             state._fsp--;
@@ -54616,23 +55047,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1__Impl"
-    // InternalMenuDsl.g:16531:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
+    // InternalMenuDsl.g:16662: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 {
-            // InternalMenuDsl.g:16535:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
-            // InternalMenuDsl.g:16536:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalMenuDsl.g:16666:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
+            // InternalMenuDsl.g:16667:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
             {
-            // InternalMenuDsl.g:16536:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
-            // InternalMenuDsl.g:16537:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalMenuDsl.g:16667:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalMenuDsl.g:16668:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_1()); 
             }
-            // InternalMenuDsl.g:16538:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
-            // InternalMenuDsl.g:16538:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
+            // InternalMenuDsl.g:16669:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalMenuDsl.g:16669:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1();
@@ -54667,16 +55098,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2"
-    // InternalMenuDsl.g:16546:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
+    // InternalMenuDsl.g:16677: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 {
-            // InternalMenuDsl.g:16550:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
-            // InternalMenuDsl.g:16551:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
+            // InternalMenuDsl.g:16681:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
+            // InternalMenuDsl.g:16682:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__JvmParameterizedTypeReference__Group_1__2__Impl();
 
             state._fsp--;
@@ -54705,37 +55136,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2__Impl"
-    // InternalMenuDsl.g:16558:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
+    // InternalMenuDsl.g:16689: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 {
-            // InternalMenuDsl.g:16562:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
-            // InternalMenuDsl.g:16563:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalMenuDsl.g:16693:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
+            // InternalMenuDsl.g:16694:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
             {
-            // InternalMenuDsl.g:16563:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
-            // InternalMenuDsl.g:16564:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalMenuDsl.g:16694:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalMenuDsl.g:16695:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_2()); 
             }
-            // InternalMenuDsl.g:16565:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
-            loop139:
+            // InternalMenuDsl.g:16696:2: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            loop137:
             do {
-                int alt139=2;
-                int LA139_0 = input.LA(1);
+                int alt137=2;
+                int LA137_0 = input.LA(1);
 
-                if ( (LA139_0==63) ) {
-                    alt139=1;
+                if ( (LA137_0==65) ) {
+                    alt137=1;
                 }
 
 
-                switch (alt139) {
+                switch (alt137) {
             	case 1 :
-            	    // InternalMenuDsl.g:16565:3: rule__JvmParameterizedTypeReference__Group_1_2__0
+            	    // InternalMenuDsl.g:16696:3: rule__JvmParameterizedTypeReference__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__JvmParameterizedTypeReference__Group_1_2__0();
 
             	    state._fsp--;
@@ -54745,7 +55176,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop139;
+            	    break loop137;
                 }
             } while (true);
 
@@ -54774,16 +55205,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3"
-    // InternalMenuDsl.g:16573:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
+    // InternalMenuDsl.g:16704: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 {
-            // InternalMenuDsl.g:16577:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
-            // InternalMenuDsl.g:16578:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
+            // InternalMenuDsl.g:16708:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
+            // InternalMenuDsl.g:16709:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_107);
             rule__JvmParameterizedTypeReference__Group_1__3__Impl();
 
             state._fsp--;
@@ -54812,17 +55243,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3__Impl"
-    // InternalMenuDsl.g:16585:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:16716:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16589:1: ( ( '>' ) )
-            // InternalMenuDsl.g:16590:1: ( '>' )
+            // InternalMenuDsl.g:16720:1: ( ( '>' ) )
+            // InternalMenuDsl.g:16721:1: ( '>' )
             {
-            // InternalMenuDsl.g:16590:1: ( '>' )
-            // InternalMenuDsl.g:16591:2: '>'
+            // InternalMenuDsl.g:16721:1: ( '>' )
+            // InternalMenuDsl.g:16722:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
@@ -54853,14 +55284,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4"
-    // InternalMenuDsl.g:16600:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
+    // InternalMenuDsl.g:16731: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 {
-            // InternalMenuDsl.g:16604:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
-            // InternalMenuDsl.g:16605:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
+            // InternalMenuDsl.g:16735:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
+            // InternalMenuDsl.g:16736:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4__Impl();
@@ -54886,35 +55317,35 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4__Impl"
-    // InternalMenuDsl.g:16611:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
+    // InternalMenuDsl.g:16742: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 {
-            // InternalMenuDsl.g:16615:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
-            // InternalMenuDsl.g:16616:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalMenuDsl.g:16746:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
+            // InternalMenuDsl.g:16747:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
             {
-            // InternalMenuDsl.g:16616:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
-            // InternalMenuDsl.g:16617:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalMenuDsl.g:16747:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalMenuDsl.g:16748:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4()); 
             }
-            // InternalMenuDsl.g:16618:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
-            loop140:
+            // InternalMenuDsl.g:16749:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            loop138:
             do {
-                int alt140=2;
-                int LA140_0 = input.LA(1);
+                int alt138=2;
+                int LA138_0 = input.LA(1);
 
-                if ( (LA140_0==43) ) {
-                    int LA140_2 = input.LA(2);
+                if ( (LA138_0==43) ) {
+                    int LA138_2 = input.LA(2);
 
-                    if ( (LA140_2==RULE_ID) ) {
-                        int LA140_3 = input.LA(3);
+                    if ( (LA138_2==RULE_ID) ) {
+                        int LA138_3 = input.LA(3);
 
-                        if ( (synpred188_InternalMenuDsl()) ) {
-                            alt140=1;
+                        if ( (synpred187_InternalMenuDsl()) ) {
+                            alt138=1;
                         }
 
 
@@ -54924,11 +55355,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
                 }
 
 
-                switch (alt140) {
+                switch (alt138) {
             	case 1 :
-            	    // InternalMenuDsl.g:16618:3: rule__JvmParameterizedTypeReference__Group_1_4__0
+            	    // InternalMenuDsl.g:16749:3: rule__JvmParameterizedTypeReference__Group_1_4__0
             	    {
-            	    pushFollow(FOLLOW_105);
+            	    pushFollow(FOLLOW_108);
             	    rule__JvmParameterizedTypeReference__Group_1_4__0();
 
             	    state._fsp--;
@@ -54938,7 +55369,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop140;
+            	    break loop138;
                 }
             } while (true);
 
@@ -54967,16 +55398,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0"
-    // InternalMenuDsl.g:16627:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
+    // InternalMenuDsl.g:16758: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 {
-            // InternalMenuDsl.g:16631:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
-            // InternalMenuDsl.g:16632:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
+            // InternalMenuDsl.g:16762:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
+            // InternalMenuDsl.g:16763:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__JvmParameterizedTypeReference__Group_1_2__0__Impl();
 
             state._fsp--;
@@ -55005,22 +55436,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0__Impl"
-    // InternalMenuDsl.g:16639:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:16770:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:16643:1: ( ( ',' ) )
-            // InternalMenuDsl.g:16644:1: ( ',' )
+            // InternalMenuDsl.g:16774:1: ( ( ',' ) )
+            // InternalMenuDsl.g:16775:1: ( ',' )
             {
-            // InternalMenuDsl.g:16644:1: ( ',' )
-            // InternalMenuDsl.g:16645:2: ','
+            // InternalMenuDsl.g:16775:1: ( ',' )
+            // InternalMenuDsl.g:16776:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
@@ -55046,14 +55477,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1"
-    // InternalMenuDsl.g:16654:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
+    // InternalMenuDsl.g:16785: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 {
-            // InternalMenuDsl.g:16658:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
-            // InternalMenuDsl.g:16659:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
+            // InternalMenuDsl.g:16789:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
+            // InternalMenuDsl.g:16790:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1__Impl();
@@ -55079,23 +55510,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1__Impl"
-    // InternalMenuDsl.g:16665:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
+    // InternalMenuDsl.g:16796: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 {
-            // InternalMenuDsl.g:16669:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
-            // InternalMenuDsl.g:16670:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalMenuDsl.g:16800:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
+            // InternalMenuDsl.g:16801:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
             {
-            // InternalMenuDsl.g:16670:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
-            // InternalMenuDsl.g:16671:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalMenuDsl.g:16801:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalMenuDsl.g:16802:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_2_1()); 
             }
-            // InternalMenuDsl.g:16672:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
-            // InternalMenuDsl.g:16672:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
+            // InternalMenuDsl.g:16803:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalMenuDsl.g:16803:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1();
@@ -55130,16 +55561,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0"
-    // InternalMenuDsl.g:16681:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
+    // InternalMenuDsl.g:16812: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 {
-            // InternalMenuDsl.g:16685:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
-            // InternalMenuDsl.g:16686:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
+            // InternalMenuDsl.g:16816:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
+            // InternalMenuDsl.g:16817:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
             {
-            pushFollow(FOLLOW_7);
+            pushFollow(FOLLOW_6);
             rule__JvmParameterizedTypeReference__Group_1_4__0__Impl();
 
             state._fsp--;
@@ -55168,23 +55599,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0__Impl"
-    // InternalMenuDsl.g:16693:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
+    // InternalMenuDsl.g:16824: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 {
-            // InternalMenuDsl.g:16697:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
-            // InternalMenuDsl.g:16698:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalMenuDsl.g:16828:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
+            // InternalMenuDsl.g:16829:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
             {
-            // InternalMenuDsl.g:16698:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
-            // InternalMenuDsl.g:16699:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalMenuDsl.g:16829:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalMenuDsl.g:16830:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0()); 
             }
-            // InternalMenuDsl.g:16700:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
-            // InternalMenuDsl.g:16700:3: rule__JvmParameterizedTypeReference__Group_1_4_0__0
+            // InternalMenuDsl.g:16831:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalMenuDsl.g:16831:3: rule__JvmParameterizedTypeReference__Group_1_4_0__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0();
@@ -55219,16 +55650,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1"
-    // InternalMenuDsl.g:16708:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
+    // InternalMenuDsl.g:16839: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 {
-            // InternalMenuDsl.g:16712:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
-            // InternalMenuDsl.g:16713:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
+            // InternalMenuDsl.g:16843:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
+            // InternalMenuDsl.g:16844:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
             {
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_36);
             rule__JvmParameterizedTypeReference__Group_1_4__1__Impl();
 
             state._fsp--;
@@ -55257,23 +55688,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1__Impl"
-    // InternalMenuDsl.g:16720:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
+    // InternalMenuDsl.g:16851: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 {
-            // InternalMenuDsl.g:16724:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
-            // InternalMenuDsl.g:16725:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalMenuDsl.g:16855:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
+            // InternalMenuDsl.g:16856:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
             {
-            // InternalMenuDsl.g:16725:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
-            // InternalMenuDsl.g:16726:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalMenuDsl.g:16856:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalMenuDsl.g:16857:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_1_4_1()); 
             }
-            // InternalMenuDsl.g:16727:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
-            // InternalMenuDsl.g:16727:3: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
+            // InternalMenuDsl.g:16858:2: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalMenuDsl.g:16858:3: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1();
@@ -55308,14 +55739,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2"
-    // InternalMenuDsl.g:16735:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
+    // InternalMenuDsl.g:16866: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 {
-            // InternalMenuDsl.g:16739:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
-            // InternalMenuDsl.g:16740:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
+            // InternalMenuDsl.g:16870:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
+            // InternalMenuDsl.g:16871:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2__Impl();
@@ -55341,27 +55772,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2__Impl"
-    // InternalMenuDsl.g:16746:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
+    // InternalMenuDsl.g:16877: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 {
-            // InternalMenuDsl.g:16750:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
-            // InternalMenuDsl.g:16751:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalMenuDsl.g:16881:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
+            // InternalMenuDsl.g:16882:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
             {
-            // InternalMenuDsl.g:16751:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
-            // InternalMenuDsl.g:16752:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalMenuDsl.g:16882:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalMenuDsl.g:16883:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2()); 
             }
-            // InternalMenuDsl.g:16753:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
-            int alt141=2;
-            alt141 = dfa141.predict(input);
-            switch (alt141) {
+            // InternalMenuDsl.g:16884:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            int alt139=2;
+            alt139 = dfa139.predict(input);
+            switch (alt139) {
                 case 1 :
-                    // InternalMenuDsl.g:16753:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+                    // InternalMenuDsl.g:16884:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1_4_2__0();
@@ -55399,14 +55830,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0"
-    // InternalMenuDsl.g:16762:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
+    // InternalMenuDsl.g:16893: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 {
-            // InternalMenuDsl.g:16766:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
-            // InternalMenuDsl.g:16767:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
+            // InternalMenuDsl.g:16897:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
+            // InternalMenuDsl.g:16898:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl();
@@ -55432,23 +55863,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl"
-    // InternalMenuDsl.g:16773:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
+    // InternalMenuDsl.g:16904: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 {
-            // InternalMenuDsl.g:16777:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
-            // InternalMenuDsl.g:16778:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalMenuDsl.g:16908:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
+            // InternalMenuDsl.g:16909:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
             {
-            // InternalMenuDsl.g:16778:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
-            // InternalMenuDsl.g:16779:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalMenuDsl.g:16909:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalMenuDsl.g:16910:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0_0()); 
             }
-            // InternalMenuDsl.g:16780:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
-            // InternalMenuDsl.g:16780:3: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
+            // InternalMenuDsl.g:16911:2: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalMenuDsl.g:16911:3: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0();
@@ -55483,16 +55914,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0"
-    // InternalMenuDsl.g:16789: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 ;
+    // InternalMenuDsl.g:16920: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 {
-            // InternalMenuDsl.g:16793:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
-            // InternalMenuDsl.g:16794:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
+            // InternalMenuDsl.g:16924:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
+            // InternalMenuDsl.g:16925:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_107);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl();
 
             state._fsp--;
@@ -55521,23 +55952,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl"
-    // InternalMenuDsl.g:16801:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:16932: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 {
-            // InternalMenuDsl.g:16805:1: ( ( () ) )
-            // InternalMenuDsl.g:16806:1: ( () )
+            // InternalMenuDsl.g:16936:1: ( ( () ) )
+            // InternalMenuDsl.g:16937:1: ( () )
             {
-            // InternalMenuDsl.g:16806:1: ( () )
-            // InternalMenuDsl.g:16807:2: ()
+            // InternalMenuDsl.g:16937:1: ( () )
+            // InternalMenuDsl.g:16938:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()); 
             }
-            // InternalMenuDsl.g:16808:2: ()
-            // InternalMenuDsl.g:16808:3: 
+            // InternalMenuDsl.g:16939:2: ()
+            // InternalMenuDsl.g:16939:3: 
             {
             }
 
@@ -55562,14 +55993,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1"
-    // InternalMenuDsl.g:16816:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
+    // InternalMenuDsl.g:16947: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 {
-            // InternalMenuDsl.g:16820:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
-            // InternalMenuDsl.g:16821:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
+            // InternalMenuDsl.g:16951:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
+            // InternalMenuDsl.g:16952:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl();
@@ -55595,17 +56026,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl"
-    // InternalMenuDsl.g:16827:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
+    // InternalMenuDsl.g:16958: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 {
-            // InternalMenuDsl.g:16831:1: ( ( '.' ) )
-            // InternalMenuDsl.g:16832:1: ( '.' )
+            // InternalMenuDsl.g:16962:1: ( ( '.' ) )
+            // InternalMenuDsl.g:16963:1: ( '.' )
             {
-            // InternalMenuDsl.g:16832:1: ( '.' )
-            // InternalMenuDsl.g:16833:2: '.'
+            // InternalMenuDsl.g:16963:1: ( '.' )
+            // InternalMenuDsl.g:16964:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
@@ -55636,16 +56067,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0"
-    // InternalMenuDsl.g:16843:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
+    // InternalMenuDsl.g:16974: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 {
-            // InternalMenuDsl.g:16847:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
-            // InternalMenuDsl.g:16848:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
+            // InternalMenuDsl.g:16978:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
+            // InternalMenuDsl.g:16979:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl();
 
             state._fsp--;
@@ -55674,23 +56105,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl"
-    // InternalMenuDsl.g:16855:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
+    // InternalMenuDsl.g:16986: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 {
-            // InternalMenuDsl.g:16859:1: ( ( ( '<' ) ) )
-            // InternalMenuDsl.g:16860:1: ( ( '<' ) )
+            // InternalMenuDsl.g:16990:1: ( ( ( '<' ) ) )
+            // InternalMenuDsl.g:16991:1: ( ( '<' ) )
             {
-            // InternalMenuDsl.g:16860:1: ( ( '<' ) )
-            // InternalMenuDsl.g:16861:2: ( '<' )
+            // InternalMenuDsl.g:16991:1: ( ( '<' ) )
+            // InternalMenuDsl.g:16992:2: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0()); 
             }
-            // InternalMenuDsl.g:16862:2: ( '<' )
-            // InternalMenuDsl.g:16862:3: '<'
+            // InternalMenuDsl.g:16993:2: ( '<' )
+            // InternalMenuDsl.g:16993:3: '<'
             {
             match(input,27,FOLLOW_2); if (state.failed) return ;
 
@@ -55721,16 +56152,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1"
-    // InternalMenuDsl.g:16870:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
+    // InternalMenuDsl.g:17001: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 {
-            // InternalMenuDsl.g:16874:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
-            // InternalMenuDsl.g:16875:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
+            // InternalMenuDsl.g:17005:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
+            // InternalMenuDsl.g:17006:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl();
 
             state._fsp--;
@@ -55759,23 +56190,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl"
-    // InternalMenuDsl.g:16882:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
+    // InternalMenuDsl.g:17013: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 {
-            // InternalMenuDsl.g:16886:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
-            // InternalMenuDsl.g:16887:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalMenuDsl.g:17017:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
+            // InternalMenuDsl.g:17018:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
             {
-            // InternalMenuDsl.g:16887:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
-            // InternalMenuDsl.g:16888:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalMenuDsl.g:17018:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalMenuDsl.g:17019:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_1()); 
             }
-            // InternalMenuDsl.g:16889:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
-            // InternalMenuDsl.g:16889:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
+            // InternalMenuDsl.g:17020:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalMenuDsl.g:17020:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1();
@@ -55810,16 +56241,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2"
-    // InternalMenuDsl.g:16897:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
+    // InternalMenuDsl.g:17028: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 {
-            // InternalMenuDsl.g:16901:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
-            // InternalMenuDsl.g:16902:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
+            // InternalMenuDsl.g:17032:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
+            // InternalMenuDsl.g:17033:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
             {
-            pushFollow(FOLLOW_65);
+            pushFollow(FOLLOW_67);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl();
 
             state._fsp--;
@@ -55848,37 +56279,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl"
-    // InternalMenuDsl.g:16909:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
+    // InternalMenuDsl.g:17040: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 {
-            // InternalMenuDsl.g:16913:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
-            // InternalMenuDsl.g:16914:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalMenuDsl.g:17044:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
+            // InternalMenuDsl.g:17045:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
             {
-            // InternalMenuDsl.g:16914:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
-            // InternalMenuDsl.g:16915:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalMenuDsl.g:17045:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalMenuDsl.g:17046:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2_2()); 
             }
-            // InternalMenuDsl.g:16916:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
-            loop142:
+            // InternalMenuDsl.g:17047:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            loop140:
             do {
-                int alt142=2;
-                int LA142_0 = input.LA(1);
+                int alt140=2;
+                int LA140_0 = input.LA(1);
 
-                if ( (LA142_0==63) ) {
-                    alt142=1;
+                if ( (LA140_0==65) ) {
+                    alt140=1;
                 }
 
 
-                switch (alt142) {
+                switch (alt140) {
             	case 1 :
-            	    // InternalMenuDsl.g:16916:3: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
+            	    // InternalMenuDsl.g:17047:3: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
             	    {
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_28);
             	    rule__JvmParameterizedTypeReference__Group_1_4_2_2__0();
 
             	    state._fsp--;
@@ -55888,7 +56319,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop142;
+            	    break loop140;
                 }
             } while (true);
 
@@ -55917,14 +56348,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3"
-    // InternalMenuDsl.g:16924:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
+    // InternalMenuDsl.g:17055: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 {
-            // InternalMenuDsl.g:16928:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
-            // InternalMenuDsl.g:16929:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
+            // InternalMenuDsl.g:17059:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
+            // InternalMenuDsl.g:17060:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl();
@@ -55950,17 +56381,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl"
-    // InternalMenuDsl.g:16935:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
+    // InternalMenuDsl.g:17066: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 {
-            // InternalMenuDsl.g:16939:1: ( ( '>' ) )
-            // InternalMenuDsl.g:16940:1: ( '>' )
+            // InternalMenuDsl.g:17070:1: ( ( '>' ) )
+            // InternalMenuDsl.g:17071:1: ( '>' )
             {
-            // InternalMenuDsl.g:16940:1: ( '>' )
-            // InternalMenuDsl.g:16941:2: '>'
+            // InternalMenuDsl.g:17071:1: ( '>' )
+            // InternalMenuDsl.g:17072:2: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
@@ -55991,16 +56422,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0"
-    // InternalMenuDsl.g:16951: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 ;
+    // InternalMenuDsl.g:17082: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 {
-            // InternalMenuDsl.g:16955:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
-            // InternalMenuDsl.g:16956:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
+            // InternalMenuDsl.g:17086:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
+            // InternalMenuDsl.g:17087:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl();
 
             state._fsp--;
@@ -56029,22 +56460,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl"
-    // InternalMenuDsl.g:16963:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
+    // InternalMenuDsl.g:17094: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 {
-            // InternalMenuDsl.g:16967:1: ( ( ',' ) )
-            // InternalMenuDsl.g:16968:1: ( ',' )
+            // InternalMenuDsl.g:17098:1: ( ( ',' ) )
+            // InternalMenuDsl.g:17099:1: ( ',' )
             {
-            // InternalMenuDsl.g:16968:1: ( ',' )
-            // InternalMenuDsl.g:16969:2: ','
+            // InternalMenuDsl.g:17099:1: ( ',' )
+            // InternalMenuDsl.g:17100:2: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
@@ -56070,14 +56501,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1"
-    // InternalMenuDsl.g:16978:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
+    // InternalMenuDsl.g:17109: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 {
-            // InternalMenuDsl.g:16982:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
-            // InternalMenuDsl.g:16983:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
+            // InternalMenuDsl.g:17113:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
+            // InternalMenuDsl.g:17114:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl();
@@ -56103,23 +56534,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl"
-    // InternalMenuDsl.g:16989:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
+    // InternalMenuDsl.g:17120: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 {
-            // InternalMenuDsl.g:16993:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
-            // InternalMenuDsl.g:16994:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalMenuDsl.g:17124:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
+            // InternalMenuDsl.g:17125:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
             {
-            // InternalMenuDsl.g:16994:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
-            // InternalMenuDsl.g:16995:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalMenuDsl.g:17125:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalMenuDsl.g:17126:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_2_1()); 
             }
-            // InternalMenuDsl.g:16996:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
-            // InternalMenuDsl.g:16996:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
+            // InternalMenuDsl.g:17127:2: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalMenuDsl.g:17127:3: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1();
@@ -56154,16 +56585,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0"
-    // InternalMenuDsl.g:17005:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
+    // InternalMenuDsl.g:17136: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 {
-            // InternalMenuDsl.g:17009:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
-            // InternalMenuDsl.g:17010:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
+            // InternalMenuDsl.g:17140:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
+            // InternalMenuDsl.g:17141:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
             {
-            pushFollow(FOLLOW_64);
+            pushFollow(FOLLOW_66);
             rule__JvmWildcardTypeReference__Group__0__Impl();
 
             state._fsp--;
@@ -56192,23 +56623,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0__Impl"
-    // InternalMenuDsl.g:17017:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
+    // InternalMenuDsl.g:17148:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
     public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17021:1: ( ( () ) )
-            // InternalMenuDsl.g:17022:1: ( () )
+            // InternalMenuDsl.g:17152:1: ( ( () ) )
+            // InternalMenuDsl.g:17153:1: ( () )
             {
-            // InternalMenuDsl.g:17022:1: ( () )
-            // InternalMenuDsl.g:17023:2: ()
+            // InternalMenuDsl.g:17153:1: ( () )
+            // InternalMenuDsl.g:17154:2: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getJvmWildcardTypeReferenceAction_0()); 
             }
-            // InternalMenuDsl.g:17024:2: ()
-            // InternalMenuDsl.g:17024:3: 
+            // InternalMenuDsl.g:17155:2: ()
+            // InternalMenuDsl.g:17155:3: 
             {
             }
 
@@ -56233,16 +56664,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1"
-    // InternalMenuDsl.g:17032:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
+    // InternalMenuDsl.g:17163: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 {
-            // InternalMenuDsl.g:17036:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
-            // InternalMenuDsl.g:17037:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
+            // InternalMenuDsl.g:17167:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
+            // InternalMenuDsl.g:17168:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
             {
-            pushFollow(FOLLOW_108);
+            pushFollow(FOLLOW_111);
             rule__JvmWildcardTypeReference__Group__1__Impl();
 
             state._fsp--;
@@ -56271,22 +56702,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1__Impl"
-    // InternalMenuDsl.g:17044:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
+    // InternalMenuDsl.g:17175:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
     public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17048:1: ( ( '?' ) )
-            // InternalMenuDsl.g:17049:1: ( '?' )
+            // InternalMenuDsl.g:17179:1: ( ( '?' ) )
+            // InternalMenuDsl.g:17180:1: ( '?' )
             {
-            // InternalMenuDsl.g:17049:1: ( '?' )
-            // InternalMenuDsl.g:17050:2: '?'
+            // InternalMenuDsl.g:17180:1: ( '?' )
+            // InternalMenuDsl.g:17181:2: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
-            match(input,87,FOLLOW_2); if (state.failed) return ;
+            match(input,89,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
@@ -56312,14 +56743,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2"
-    // InternalMenuDsl.g:17059:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
+    // InternalMenuDsl.g:17190:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
     public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17063:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
-            // InternalMenuDsl.g:17064:2: rule__JvmWildcardTypeReference__Group__2__Impl
+            // InternalMenuDsl.g:17194:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
+            // InternalMenuDsl.g:17195:2: rule__JvmWildcardTypeReference__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2__Impl();
@@ -56345,31 +56776,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2__Impl"
-    // InternalMenuDsl.g:17070:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
+    // InternalMenuDsl.g:17201:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
     public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17074:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
-            // InternalMenuDsl.g:17075:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalMenuDsl.g:17205:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
+            // InternalMenuDsl.g:17206:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
             {
-            // InternalMenuDsl.g:17075:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
-            // InternalMenuDsl.g:17076:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalMenuDsl.g:17206:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalMenuDsl.g:17207:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getAlternatives_2()); 
             }
-            // InternalMenuDsl.g:17077:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
-            int alt143=2;
-            int LA143_0 = input.LA(1);
+            // InternalMenuDsl.g:17208:2: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            int alt141=2;
+            int LA141_0 = input.LA(1);
 
-            if ( (LA143_0==45||LA143_0==49) ) {
-                alt143=1;
+            if ( (LA141_0==45||LA141_0==49) ) {
+                alt141=1;
             }
-            switch (alt143) {
+            switch (alt141) {
                 case 1 :
-                    // InternalMenuDsl.g:17077:3: rule__JvmWildcardTypeReference__Alternatives_2
+                    // InternalMenuDsl.g:17208:3: rule__JvmWildcardTypeReference__Alternatives_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Alternatives_2();
@@ -56407,16 +56838,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0"
-    // InternalMenuDsl.g:17086:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
+    // InternalMenuDsl.g:17217: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 {
-            // InternalMenuDsl.g:17090:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
-            // InternalMenuDsl.g:17091:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
+            // InternalMenuDsl.g:17221:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
+            // InternalMenuDsl.g:17222:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
             {
-            pushFollow(FOLLOW_109);
+            pushFollow(FOLLOW_112);
             rule__JvmWildcardTypeReference__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -56445,23 +56876,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0__Impl"
-    // InternalMenuDsl.g:17098:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
+    // InternalMenuDsl.g:17229: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 {
-            // InternalMenuDsl.g:17102:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
-            // InternalMenuDsl.g:17103:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalMenuDsl.g:17233:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
+            // InternalMenuDsl.g:17234:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
             {
-            // InternalMenuDsl.g:17103:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
-            // InternalMenuDsl.g:17104:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalMenuDsl.g:17234:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalMenuDsl.g:17235:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_0()); 
             }
-            // InternalMenuDsl.g:17105:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
-            // InternalMenuDsl.g:17105:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
+            // InternalMenuDsl.g:17236:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalMenuDsl.g:17236:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0();
@@ -56496,14 +56927,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1"
-    // InternalMenuDsl.g:17113:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
+    // InternalMenuDsl.g:17244: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 {
-            // InternalMenuDsl.g:17117:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
-            // InternalMenuDsl.g:17118:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
+            // InternalMenuDsl.g:17248:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
+            // InternalMenuDsl.g:17249:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1__Impl();
@@ -56529,37 +56960,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1__Impl"
-    // InternalMenuDsl.g:17124:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
+    // InternalMenuDsl.g:17255: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 {
-            // InternalMenuDsl.g:17128:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
-            // InternalMenuDsl.g:17129:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalMenuDsl.g:17259:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
+            // InternalMenuDsl.g:17260:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
             {
-            // InternalMenuDsl.g:17129:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
-            // InternalMenuDsl.g:17130:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalMenuDsl.g:17260:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalMenuDsl.g:17261:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_1()); 
             }
-            // InternalMenuDsl.g:17131:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
-            loop144:
+            // InternalMenuDsl.g:17262:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            loop142:
             do {
-                int alt144=2;
-                int LA144_0 = input.LA(1);
+                int alt142=2;
+                int LA142_0 = input.LA(1);
 
-                if ( (LA144_0==88) ) {
-                    alt144=1;
+                if ( (LA142_0==90) ) {
+                    alt142=1;
                 }
 
 
-                switch (alt144) {
+                switch (alt142) {
             	case 1 :
-            	    // InternalMenuDsl.g:17131:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
+            	    // InternalMenuDsl.g:17262:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
             	    {
-            	    pushFollow(FOLLOW_110);
+            	    pushFollow(FOLLOW_113);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1();
 
             	    state._fsp--;
@@ -56569,7 +57000,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop144;
+            	    break loop142;
                 }
             } while (true);
 
@@ -56598,16 +57029,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0"
-    // InternalMenuDsl.g:17140:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
+    // InternalMenuDsl.g:17271: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 {
-            // InternalMenuDsl.g:17144:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
-            // InternalMenuDsl.g:17145:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
+            // InternalMenuDsl.g:17275:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
+            // InternalMenuDsl.g:17276:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
             {
-            pushFollow(FOLLOW_109);
+            pushFollow(FOLLOW_112);
             rule__JvmWildcardTypeReference__Group_2_1__0__Impl();
 
             state._fsp--;
@@ -56636,23 +57067,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0__Impl"
-    // InternalMenuDsl.g:17152:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
+    // InternalMenuDsl.g:17283: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 {
-            // InternalMenuDsl.g:17156:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
-            // InternalMenuDsl.g:17157:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalMenuDsl.g:17287:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
+            // InternalMenuDsl.g:17288:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
             {
-            // InternalMenuDsl.g:17157:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
-            // InternalMenuDsl.g:17158:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalMenuDsl.g:17288:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalMenuDsl.g:17289:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_0()); 
             }
-            // InternalMenuDsl.g:17159:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
-            // InternalMenuDsl.g:17159:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
+            // InternalMenuDsl.g:17290:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalMenuDsl.g:17290:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0();
@@ -56687,14 +57118,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1"
-    // InternalMenuDsl.g:17167:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
+    // InternalMenuDsl.g:17298: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 {
-            // InternalMenuDsl.g:17171:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
-            // InternalMenuDsl.g:17172:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
+            // InternalMenuDsl.g:17302:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
+            // InternalMenuDsl.g:17303:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1__Impl();
@@ -56720,37 +57151,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1__Impl"
-    // InternalMenuDsl.g:17178:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
+    // InternalMenuDsl.g:17309: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 {
-            // InternalMenuDsl.g:17182:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
-            // InternalMenuDsl.g:17183:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalMenuDsl.g:17313:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
+            // InternalMenuDsl.g:17314:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
             {
-            // InternalMenuDsl.g:17183:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
-            // InternalMenuDsl.g:17184:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalMenuDsl.g:17314:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalMenuDsl.g:17315:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_1()); 
             }
-            // InternalMenuDsl.g:17185:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
-            loop145:
+            // InternalMenuDsl.g:17316:2: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            loop143:
             do {
-                int alt145=2;
-                int LA145_0 = input.LA(1);
+                int alt143=2;
+                int LA143_0 = input.LA(1);
 
-                if ( (LA145_0==88) ) {
-                    alt145=1;
+                if ( (LA143_0==90) ) {
+                    alt143=1;
                 }
 
 
-                switch (alt145) {
+                switch (alt143) {
             	case 1 :
-            	    // InternalMenuDsl.g:17185:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
+            	    // InternalMenuDsl.g:17316:3: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
             	    {
-            	    pushFollow(FOLLOW_110);
+            	    pushFollow(FOLLOW_113);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1();
 
             	    state._fsp--;
@@ -56760,7 +57191,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             	    break;
 
             	default :
-            	    break loop145;
+            	    break loop143;
                 }
             } while (true);
 
@@ -56789,16 +57220,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0"
-    // InternalMenuDsl.g:17194:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
+    // InternalMenuDsl.g:17325: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 {
-            // InternalMenuDsl.g:17198:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
-            // InternalMenuDsl.g:17199:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
+            // InternalMenuDsl.g:17329:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
+            // InternalMenuDsl.g:17330:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__JvmUpperBound__Group__0__Impl();
 
             state._fsp--;
@@ -56827,17 +57258,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0__Impl"
-    // InternalMenuDsl.g:17206:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
+    // InternalMenuDsl.g:17337:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
     public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17210:1: ( ( 'extends' ) )
-            // InternalMenuDsl.g:17211:1: ( 'extends' )
+            // InternalMenuDsl.g:17341:1: ( ( 'extends' ) )
+            // InternalMenuDsl.g:17342:1: ( 'extends' )
             {
-            // InternalMenuDsl.g:17211:1: ( 'extends' )
-            // InternalMenuDsl.g:17212:2: 'extends'
+            // InternalMenuDsl.g:17342:1: ( 'extends' )
+            // InternalMenuDsl.g:17343:2: 'extends'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
@@ -56868,14 +57299,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1"
-    // InternalMenuDsl.g:17221:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
+    // InternalMenuDsl.g:17352:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
     public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17225:1: ( rule__JvmUpperBound__Group__1__Impl )
-            // InternalMenuDsl.g:17226:2: rule__JvmUpperBound__Group__1__Impl
+            // InternalMenuDsl.g:17356:1: ( rule__JvmUpperBound__Group__1__Impl )
+            // InternalMenuDsl.g:17357:2: rule__JvmUpperBound__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1__Impl();
@@ -56901,23 +57332,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1__Impl"
-    // InternalMenuDsl.g:17232:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalMenuDsl.g:17363:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17236:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
-            // InternalMenuDsl.g:17237:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17367:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
+            // InternalMenuDsl.g:17368:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
             {
-            // InternalMenuDsl.g:17237:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
-            // InternalMenuDsl.g:17238:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17368:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17369:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalMenuDsl.g:17239:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
-            // InternalMenuDsl.g:17239:3: rule__JvmUpperBound__TypeReferenceAssignment_1
+            // InternalMenuDsl.g:17370:2: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17370:3: rule__JvmUpperBound__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBound__TypeReferenceAssignment_1();
@@ -56952,16 +57383,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0"
-    // InternalMenuDsl.g:17248:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
+    // InternalMenuDsl.g:17379: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 {
-            // InternalMenuDsl.g:17252:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
-            // InternalMenuDsl.g:17253:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
+            // InternalMenuDsl.g:17383:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
+            // InternalMenuDsl.g:17384:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__JvmUpperBoundAnded__Group__0__Impl();
 
             state._fsp--;
@@ -56990,22 +57421,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0__Impl"
-    // InternalMenuDsl.g:17260:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalMenuDsl.g:17391:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17264:1: ( ( '&' ) )
-            // InternalMenuDsl.g:17265:1: ( '&' )
+            // InternalMenuDsl.g:17395:1: ( ( '&' ) )
+            // InternalMenuDsl.g:17396:1: ( '&' )
             {
-            // InternalMenuDsl.g:17265:1: ( '&' )
-            // InternalMenuDsl.g:17266:2: '&'
+            // InternalMenuDsl.g:17396:1: ( '&' )
+            // InternalMenuDsl.g:17397:2: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,88,FOLLOW_2); if (state.failed) return ;
+            match(input,90,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -57031,14 +57462,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1"
-    // InternalMenuDsl.g:17275:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
+    // InternalMenuDsl.g:17406:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
     public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17279:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
-            // InternalMenuDsl.g:17280:2: rule__JvmUpperBoundAnded__Group__1__Impl
+            // InternalMenuDsl.g:17410:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
+            // InternalMenuDsl.g:17411:2: rule__JvmUpperBoundAnded__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1__Impl();
@@ -57064,23 +57495,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1__Impl"
-    // InternalMenuDsl.g:17286:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalMenuDsl.g:17417:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17290:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // InternalMenuDsl.g:17291:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17421:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalMenuDsl.g:17422:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // InternalMenuDsl.g:17291:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
-            // InternalMenuDsl.g:17292:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17422:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17423:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalMenuDsl.g:17293:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
-            // InternalMenuDsl.g:17293:3: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
+            // InternalMenuDsl.g:17424:2: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17424:3: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__TypeReferenceAssignment_1();
@@ -57115,16 +57546,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0"
-    // InternalMenuDsl.g:17302:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
+    // InternalMenuDsl.g:17433: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 {
-            // InternalMenuDsl.g:17306:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
-            // InternalMenuDsl.g:17307:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
+            // InternalMenuDsl.g:17437:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
+            // InternalMenuDsl.g:17438:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__JvmLowerBound__Group__0__Impl();
 
             state._fsp--;
@@ -57153,17 +57584,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0__Impl"
-    // InternalMenuDsl.g:17314:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
+    // InternalMenuDsl.g:17445:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
     public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17318:1: ( ( 'super' ) )
-            // InternalMenuDsl.g:17319:1: ( 'super' )
+            // InternalMenuDsl.g:17449:1: ( ( 'super' ) )
+            // InternalMenuDsl.g:17450:1: ( 'super' )
             {
-            // InternalMenuDsl.g:17319:1: ( 'super' )
-            // InternalMenuDsl.g:17320:2: 'super'
+            // InternalMenuDsl.g:17450:1: ( 'super' )
+            // InternalMenuDsl.g:17451:2: 'super'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
@@ -57194,14 +57625,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1"
-    // InternalMenuDsl.g:17329:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
+    // InternalMenuDsl.g:17460:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
     public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17333:1: ( rule__JvmLowerBound__Group__1__Impl )
-            // InternalMenuDsl.g:17334:2: rule__JvmLowerBound__Group__1__Impl
+            // InternalMenuDsl.g:17464:1: ( rule__JvmLowerBound__Group__1__Impl )
+            // InternalMenuDsl.g:17465:2: rule__JvmLowerBound__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1__Impl();
@@ -57227,23 +57658,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1__Impl"
-    // InternalMenuDsl.g:17340:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalMenuDsl.g:17471:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17344:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
-            // InternalMenuDsl.g:17345:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17475:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
+            // InternalMenuDsl.g:17476:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
             {
-            // InternalMenuDsl.g:17345:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
-            // InternalMenuDsl.g:17346:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17476:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17477:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalMenuDsl.g:17347:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
-            // InternalMenuDsl.g:17347:3: rule__JvmLowerBound__TypeReferenceAssignment_1
+            // InternalMenuDsl.g:17478:2: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17478:3: rule__JvmLowerBound__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBound__TypeReferenceAssignment_1();
@@ -57278,16 +57709,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0"
-    // InternalMenuDsl.g:17356:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
+    // InternalMenuDsl.g:17487: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 {
-            // InternalMenuDsl.g:17360:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
-            // InternalMenuDsl.g:17361:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
+            // InternalMenuDsl.g:17491:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
+            // InternalMenuDsl.g:17492:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_44);
+            pushFollow(FOLLOW_46);
             rule__JvmLowerBoundAnded__Group__0__Impl();
 
             state._fsp--;
@@ -57316,22 +57747,22 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0__Impl"
-    // InternalMenuDsl.g:17368:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalMenuDsl.g:17499:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17372:1: ( ( '&' ) )
-            // InternalMenuDsl.g:17373:1: ( '&' )
+            // InternalMenuDsl.g:17503:1: ( ( '&' ) )
+            // InternalMenuDsl.g:17504:1: ( '&' )
             {
-            // InternalMenuDsl.g:17373:1: ( '&' )
-            // InternalMenuDsl.g:17374:2: '&'
+            // InternalMenuDsl.g:17504:1: ( '&' )
+            // InternalMenuDsl.g:17505:2: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,88,FOLLOW_2); if (state.failed) return ;
+            match(input,90,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -57357,14 +57788,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1"
-    // InternalMenuDsl.g:17383:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
+    // InternalMenuDsl.g:17514:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
     public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17387:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
-            // InternalMenuDsl.g:17388:2: rule__JvmLowerBoundAnded__Group__1__Impl
+            // InternalMenuDsl.g:17518:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
+            // InternalMenuDsl.g:17519:2: rule__JvmLowerBoundAnded__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1__Impl();
@@ -57390,23 +57821,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1__Impl"
-    // InternalMenuDsl.g:17394:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalMenuDsl.g:17525:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17398:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // InternalMenuDsl.g:17399:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17529:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalMenuDsl.g:17530:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // InternalMenuDsl.g:17399:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
-            // InternalMenuDsl.g:17400:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17530:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalMenuDsl.g:17531:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // InternalMenuDsl.g:17401:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
-            // InternalMenuDsl.g:17401:3: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
+            // InternalMenuDsl.g:17532:2: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalMenuDsl.g:17532:3: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__TypeReferenceAssignment_1();
@@ -57441,16 +57872,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0"
-    // InternalMenuDsl.g:17410:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
+    // InternalMenuDsl.g:17541: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 {
-            // InternalMenuDsl.g:17414:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
-            // InternalMenuDsl.g:17415:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
+            // InternalMenuDsl.g:17545:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
+            // InternalMenuDsl.g:17546:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_107);
             rule__QualifiedNameWithWildcard__Group__0__Impl();
 
             state._fsp--;
@@ -57479,17 +57910,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0__Impl"
-    // InternalMenuDsl.g:17422:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
+    // InternalMenuDsl.g:17553:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
     public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17426:1: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:17427:1: ( ruleQualifiedName )
+            // InternalMenuDsl.g:17557:1: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:17558:1: ( ruleQualifiedName )
             {
-            // InternalMenuDsl.g:17427:1: ( ruleQualifiedName )
-            // InternalMenuDsl.g:17428:2: ruleQualifiedName
+            // InternalMenuDsl.g:17558:1: ( ruleQualifiedName )
+            // InternalMenuDsl.g:17559:2: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
@@ -57524,16 +57955,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1"
-    // InternalMenuDsl.g:17437:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
+    // InternalMenuDsl.g:17568: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 {
-            // InternalMenuDsl.g:17441:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
-            // InternalMenuDsl.g:17442:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
+            // InternalMenuDsl.g:17572:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
+            // InternalMenuDsl.g:17573:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
             {
-            pushFollow(FOLLOW_111);
+            pushFollow(FOLLOW_114);
             rule__QualifiedNameWithWildcard__Group__1__Impl();
 
             state._fsp--;
@@ -57562,17 +57993,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1__Impl"
-    // InternalMenuDsl.g:17449:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
+    // InternalMenuDsl.g:17580:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17453:1: ( ( '.' ) )
-            // InternalMenuDsl.g:17454:1: ( '.' )
+            // InternalMenuDsl.g:17584:1: ( ( '.' ) )
+            // InternalMenuDsl.g:17585:1: ( '.' )
             {
-            // InternalMenuDsl.g:17454:1: ( '.' )
-            // InternalMenuDsl.g:17455:2: '.'
+            // InternalMenuDsl.g:17585:1: ( '.' )
+            // InternalMenuDsl.g:17586:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
@@ -57603,14 +58034,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2"
-    // InternalMenuDsl.g:17464:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
+    // InternalMenuDsl.g:17595:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17468:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
-            // InternalMenuDsl.g:17469:2: rule__QualifiedNameWithWildcard__Group__2__Impl
+            // InternalMenuDsl.g:17599:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
+            // InternalMenuDsl.g:17600:2: rule__QualifiedNameWithWildcard__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2__Impl();
@@ -57636,17 +58067,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2__Impl"
-    // InternalMenuDsl.g:17475:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
+    // InternalMenuDsl.g:17606:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17479:1: ( ( '*' ) )
-            // InternalMenuDsl.g:17480:1: ( '*' )
+            // InternalMenuDsl.g:17610:1: ( ( '*' ) )
+            // InternalMenuDsl.g:17611:1: ( '*' )
             {
-            // InternalMenuDsl.g:17480:1: ( '*' )
-            // InternalMenuDsl.g:17481:2: '*'
+            // InternalMenuDsl.g:17611:1: ( '*' )
+            // InternalMenuDsl.g:17612:2: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
@@ -57677,16 +58108,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0"
-    // InternalMenuDsl.g:17491:1: rule__QualifiedNameInStaticImport__Group__0 : rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 ;
+    // InternalMenuDsl.g:17622: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 {
-            // InternalMenuDsl.g:17495:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
-            // InternalMenuDsl.g:17496:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
+            // InternalMenuDsl.g:17626:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
+            // InternalMenuDsl.g:17627:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
             {
-            pushFollow(FOLLOW_104);
+            pushFollow(FOLLOW_107);
             rule__QualifiedNameInStaticImport__Group__0__Impl();
 
             state._fsp--;
@@ -57715,17 +58146,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0__Impl"
-    // InternalMenuDsl.g:17503:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
+    // InternalMenuDsl.g:17634:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedNameInStaticImport__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17507:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:17508:1: ( ruleValidID )
+            // InternalMenuDsl.g:17638:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:17639:1: ( ruleValidID )
             {
-            // InternalMenuDsl.g:17508:1: ( ruleValidID )
-            // InternalMenuDsl.g:17509:2: ruleValidID
+            // InternalMenuDsl.g:17639:1: ( ruleValidID )
+            // InternalMenuDsl.g:17640:2: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getValidIDParserRuleCall_0()); 
@@ -57760,14 +58191,14 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1"
-    // InternalMenuDsl.g:17518:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
+    // InternalMenuDsl.g:17649:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
     public final void rule__QualifiedNameInStaticImport__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17522:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
-            // InternalMenuDsl.g:17523:2: rule__QualifiedNameInStaticImport__Group__1__Impl
+            // InternalMenuDsl.g:17653:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
+            // InternalMenuDsl.g:17654:2: rule__QualifiedNameInStaticImport__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedNameInStaticImport__Group__1__Impl();
@@ -57793,17 +58224,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1__Impl"
-    // InternalMenuDsl.g:17529:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
+    // InternalMenuDsl.g:17660:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameInStaticImport__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17533:1: ( ( '.' ) )
-            // InternalMenuDsl.g:17534:1: ( '.' )
+            // InternalMenuDsl.g:17664:1: ( ( '.' ) )
+            // InternalMenuDsl.g:17665:1: ( '.' )
             {
-            // InternalMenuDsl.g:17534:1: ( '.' )
-            // InternalMenuDsl.g:17535:2: '.'
+            // InternalMenuDsl.g:17665:1: ( '.' )
+            // InternalMenuDsl.g:17666:2: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getFullStopKeyword_1()); 
@@ -57834,17 +58265,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MenuModel__ImportSectionAssignment_0"
-    // InternalMenuDsl.g:17545:1: rule__MenuModel__ImportSectionAssignment_0 : ( ruleXImportSection ) ;
+    // InternalMenuDsl.g:17676:1: rule__MenuModel__ImportSectionAssignment_0 : ( ruleXImportSection ) ;
     public final void rule__MenuModel__ImportSectionAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17549:1: ( ( ruleXImportSection ) )
-            // InternalMenuDsl.g:17550:2: ( ruleXImportSection )
+            // InternalMenuDsl.g:17680:1: ( ( ruleXImportSection ) )
+            // InternalMenuDsl.g:17681:2: ( ruleXImportSection )
             {
-            // InternalMenuDsl.g:17550:2: ( ruleXImportSection )
-            // InternalMenuDsl.g:17551:3: ruleXImportSection
+            // InternalMenuDsl.g:17681:2: ( ruleXImportSection )
+            // InternalMenuDsl.g:17682:3: ruleXImportSection
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuModelAccess().getImportSectionXImportSectionParserRuleCall_0_0()); 
@@ -57878,21 +58309,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__MenuModel__ImportSectionAssignment_0"
 
 
-    // $ANTLR start "rule__MenuModel__PackagesAssignment_1"
-    // InternalMenuDsl.g:17560:1: rule__MenuModel__PackagesAssignment_1 : ( ruleMenuPackage ) ;
-    public final void rule__MenuModel__PackagesAssignment_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuModel__MenupackageAssignment_1"
+    // InternalMenuDsl.g:17691:1: rule__MenuModel__MenupackageAssignment_1 : ( ruleMenuPackage ) ;
+    public final void rule__MenuModel__MenupackageAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17564:1: ( ( ruleMenuPackage ) )
-            // InternalMenuDsl.g:17565:2: ( ruleMenuPackage )
+            // InternalMenuDsl.g:17695:1: ( ( ruleMenuPackage ) )
+            // InternalMenuDsl.g:17696:2: ( ruleMenuPackage )
             {
-            // InternalMenuDsl.g:17565:2: ( ruleMenuPackage )
-            // InternalMenuDsl.g:17566:3: ruleMenuPackage
+            // InternalMenuDsl.g:17696:2: ( ruleMenuPackage )
+            // InternalMenuDsl.g:17697:3: ruleMenuPackage
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuModelAccess().getPackagesMenuPackageParserRuleCall_1_0()); 
+               before(grammarAccess.getMenuModelAccess().getMenupackageMenuPackageParserRuleCall_1_0()); 
             }
             pushFollow(FOLLOW_2);
             ruleMenuPackage();
@@ -57900,7 +58331,7 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuModelAccess().getPackagesMenuPackageParserRuleCall_1_0()); 
+               after(grammarAccess.getMenuModelAccess().getMenupackageMenuPackageParserRuleCall_1_0()); 
             }
 
             }
@@ -57920,21 +58351,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuModel__PackagesAssignment_1"
+    // $ANTLR end "rule__MenuModel__MenupackageAssignment_1"
 
 
     // $ANTLR start "rule__MenuPackage__NameAssignment_2"
-    // InternalMenuDsl.g:17575:1: rule__MenuPackage__NameAssignment_2 : ( ruleQualifiedName ) ;
+    // InternalMenuDsl.g:17706:1: rule__MenuPackage__NameAssignment_2 : ( ruleQualifiedName ) ;
     public final void rule__MenuPackage__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17579:1: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:17580:2: ( ruleQualifiedName )
+            // InternalMenuDsl.g:17710:1: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:17711:2: ( ruleQualifiedName )
             {
-            // InternalMenuDsl.g:17580:2: ( ruleQualifiedName )
-            // InternalMenuDsl.g:17581:3: ruleQualifiedName
+            // InternalMenuDsl.g:17711:2: ( ruleQualifiedName )
+            // InternalMenuDsl.g:17712:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMenuPackageAccess().getNameQualifiedNameParserRuleCall_2_0()); 
@@ -57968,25 +58399,25 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__MenuPackage__NameAssignment_2"
 
 
-    // $ANTLR start "rule__MenuPackage__ExpandedImageAssignment_3_2"
-    // InternalMenuDsl.g:17590:1: rule__MenuPackage__ExpandedImageAssignment_3_2 : ( RULE_STRING ) ;
-    public final void rule__MenuPackage__ExpandedImageAssignment_3_2() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__ExpandedImageAssignment_3_1"
+    // InternalMenuDsl.g:17721:1: rule__MenuPackage__ExpandedImageAssignment_3_1 : ( RULE_STRING ) ;
+    public final void rule__MenuPackage__ExpandedImageAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17594:1: ( ( RULE_STRING ) )
-            // InternalMenuDsl.g:17595:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17725:1: ( ( RULE_STRING ) )
+            // InternalMenuDsl.g:17726:2: ( RULE_STRING )
             {
-            // InternalMenuDsl.g:17595:2: ( RULE_STRING )
-            // InternalMenuDsl.g:17596:3: RULE_STRING
+            // InternalMenuDsl.g:17726:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17727:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_2_0()); 
+               before(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_1_0()); 
             }
             match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_2_0()); 
+               after(grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_1_0()); 
             }
 
             }
@@ -58006,28 +58437,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__ExpandedImageAssignment_3_2"
+    // $ANTLR end "rule__MenuPackage__ExpandedImageAssignment_3_1"
 
 
-    // $ANTLR start "rule__MenuPackage__CollapsedImageAssignment_3_4"
-    // InternalMenuDsl.g:17605:1: rule__MenuPackage__CollapsedImageAssignment_3_4 : ( RULE_STRING ) ;
-    public final void rule__MenuPackage__CollapsedImageAssignment_3_4() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__CollapsedImageAssignment_3_3"
+    // InternalMenuDsl.g:17736:1: rule__MenuPackage__CollapsedImageAssignment_3_3 : ( RULE_STRING ) ;
+    public final void rule__MenuPackage__CollapsedImageAssignment_3_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17609:1: ( ( RULE_STRING ) )
-            // InternalMenuDsl.g:17610:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17740:1: ( ( RULE_STRING ) )
+            // InternalMenuDsl.g:17741:2: ( RULE_STRING )
             {
-            // InternalMenuDsl.g:17610:2: ( RULE_STRING )
-            // InternalMenuDsl.g:17611:3: RULE_STRING
+            // InternalMenuDsl.g:17741:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17742:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_4_0()); 
+               before(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_3_0()); 
             }
             match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_4_0()); 
+               after(grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_3_0()); 
             }
 
             }
@@ -58047,40 +58478,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__CollapsedImageAssignment_3_4"
+    // $ANTLR end "rule__MenuPackage__CollapsedImageAssignment_3_3"
 
 
-    // $ANTLR start "rule__MenuPackage__SubMenuIsAccordionAssignment_3_5"
-    // InternalMenuDsl.g:17620:1: rule__MenuPackage__SubMenuIsAccordionAssignment_3_5 : ( ( 'accordionSubmenu' ) ) ;
-    public final void rule__MenuPackage__SubMenuIsAccordionAssignment_3_5() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__HeightAssignment_3_4_1"
+    // InternalMenuDsl.g:17751:1: rule__MenuPackage__HeightAssignment_3_4_1 : ( RULE_STRING ) ;
+    public final void rule__MenuPackage__HeightAssignment_3_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17624:1: ( ( ( 'accordionSubmenu' ) ) )
-            // InternalMenuDsl.g:17625:2: ( ( 'accordionSubmenu' ) )
-            {
-            // InternalMenuDsl.g:17625:2: ( ( 'accordionSubmenu' ) )
-            // InternalMenuDsl.g:17626:3: ( 'accordionSubmenu' )
+            // InternalMenuDsl.g:17755:1: ( ( RULE_STRING ) )
+            // InternalMenuDsl.g:17756:2: ( RULE_STRING )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); 
-            }
-            // InternalMenuDsl.g:17627:3: ( 'accordionSubmenu' )
-            // InternalMenuDsl.g:17628:4: 'accordionSubmenu'
+            // InternalMenuDsl.g:17756:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17757:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); 
-            }
-            match(input,89,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); 
-            }
-
+               before(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_4_1_0()); 
             }
-
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0()); 
+               after(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_4_1_0()); 
             }
 
             }
@@ -58100,28 +58519,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__SubMenuIsAccordionAssignment_3_5"
+    // $ANTLR end "rule__MenuPackage__HeightAssignment_3_4_1"
 
 
-    // $ANTLR start "rule__MenuPackage__HeightAssignment_3_6_1"
-    // InternalMenuDsl.g:17639:1: rule__MenuPackage__HeightAssignment_3_6_1 : ( RULE_STRING ) ;
-    public final void rule__MenuPackage__HeightAssignment_3_6_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__WidthAssignment_3_5_1"
+    // InternalMenuDsl.g:17766:1: rule__MenuPackage__WidthAssignment_3_5_1 : ( RULE_STRING ) ;
+    public final void rule__MenuPackage__WidthAssignment_3_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17643:1: ( ( RULE_STRING ) )
-            // InternalMenuDsl.g:17644:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17770:1: ( ( RULE_STRING ) )
+            // InternalMenuDsl.g:17771:2: ( RULE_STRING )
             {
-            // InternalMenuDsl.g:17644:2: ( RULE_STRING )
-            // InternalMenuDsl.g:17645:3: RULE_STRING
+            // InternalMenuDsl.g:17771:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17772:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_6_1_0()); 
+               before(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_5_1_0()); 
             }
             match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_6_1_0()); 
+               after(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_5_1_0()); 
             }
 
             }
@@ -58141,28 +58560,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__HeightAssignment_3_6_1"
+    // $ANTLR end "rule__MenuPackage__WidthAssignment_3_5_1"
 
 
-    // $ANTLR start "rule__MenuPackage__WidthAssignment_3_7_1"
-    // InternalMenuDsl.g:17654:1: rule__MenuPackage__WidthAssignment_3_7_1 : ( RULE_STRING ) ;
-    public final void rule__MenuPackage__WidthAssignment_3_7_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__HasDesignerAssignment_3_6"
+    // InternalMenuDsl.g:17781:1: rule__MenuPackage__HasDesignerAssignment_3_6 : ( ( 'designer' ) ) ;
+    public final void rule__MenuPackage__HasDesignerAssignment_3_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17658:1: ( ( RULE_STRING ) )
-            // InternalMenuDsl.g:17659:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17785:1: ( ( ( 'designer' ) ) )
+            // InternalMenuDsl.g:17786:2: ( ( 'designer' ) )
             {
-            // InternalMenuDsl.g:17659:2: ( RULE_STRING )
-            // InternalMenuDsl.g:17660:3: RULE_STRING
+            // InternalMenuDsl.g:17786:2: ( ( 'designer' ) )
+            // InternalMenuDsl.g:17787:3: ( 'designer' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_7_1_0()); 
+               before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:17788:3: ( 'designer' )
+            // InternalMenuDsl.g:17789:4: 'designer'
+            {
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_7_1_0()); 
+               before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); 
+            }
+            match(input,91,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); 
+            }
+
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0()); 
             }
 
             }
@@ -58182,40 +58613,32 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__WidthAssignment_3_7_1"
+    // $ANTLR end "rule__MenuPackage__HasDesignerAssignment_3_6"
 
 
-    // $ANTLR start "rule__MenuPackage__HasDesignerAssignment_3_8"
-    // InternalMenuDsl.g:17669:1: rule__MenuPackage__HasDesignerAssignment_3_8 : ( ( 'designer' ) ) ;
-    public final void rule__MenuPackage__HasDesignerAssignment_3_8() throws RecognitionException {
+    // $ANTLR start "rule__MenuPackage__CategoriesAssignment_3_7"
+    // InternalMenuDsl.g:17800:1: rule__MenuPackage__CategoriesAssignment_3_7 : ( ruleMenuCategory ) ;
+    public final void rule__MenuPackage__CategoriesAssignment_3_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17673:1: ( ( ( 'designer' ) ) )
-            // InternalMenuDsl.g:17674:2: ( ( 'designer' ) )
+            // InternalMenuDsl.g:17804:1: ( ( ruleMenuCategory ) )
+            // InternalMenuDsl.g:17805:2: ( ruleMenuCategory )
             {
-            // InternalMenuDsl.g:17674:2: ( ( 'designer' ) )
-            // InternalMenuDsl.g:17675:3: ( 'designer' )
+            // InternalMenuDsl.g:17805:2: ( ruleMenuCategory )
+            // InternalMenuDsl.g:17806:3: ruleMenuCategory
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); 
-            }
-            // InternalMenuDsl.g:17676:3: ( 'designer' )
-            // InternalMenuDsl.g:17677:4: 'designer'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); 
-            }
-            match(input,90,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); 
-            }
-
+               before(grammarAccess.getMenuPackageAccess().getCategoriesMenuCategoryParserRuleCall_3_7_0()); 
             }
+            pushFollow(FOLLOW_2);
+            ruleMenuCategory();
 
+            state._fsp--;
+            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0()); 
+               after(grammarAccess.getMenuPackageAccess().getCategoriesMenuCategoryParserRuleCall_3_7_0()); 
             }
 
             }
@@ -58235,32 +58658,32 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__HasDesignerAssignment_3_8"
+    // $ANTLR end "rule__MenuPackage__CategoriesAssignment_3_7"
 
 
-    // $ANTLR start "rule__MenuPackage__EntriesAssignment_3_9"
-    // InternalMenuDsl.g:17688:1: rule__MenuPackage__EntriesAssignment_3_9 : ( ruleMenuEntry ) ;
-    public final void rule__MenuPackage__EntriesAssignment_3_9() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__NameAssignment_1"
+    // InternalMenuDsl.g:17815:1: rule__MenuCategory__NameAssignment_1 : ( ruleTRANSLATABLEID ) ;
+    public final void rule__MenuCategory__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17692:1: ( ( ruleMenuEntry ) )
-            // InternalMenuDsl.g:17693:2: ( ruleMenuEntry )
+            // InternalMenuDsl.g:17819:1: ( ( ruleTRANSLATABLEID ) )
+            // InternalMenuDsl.g:17820:2: ( ruleTRANSLATABLEID )
             {
-            // InternalMenuDsl.g:17693:2: ( ruleMenuEntry )
-            // InternalMenuDsl.g:17694:3: ruleMenuEntry
+            // InternalMenuDsl.g:17820:2: ( ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:17821:3: ruleTRANSLATABLEID
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuPackageAccess().getEntriesMenuEntryParserRuleCall_3_9_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); 
             }
             pushFollow(FOLLOW_2);
-            ruleMenuEntry();
+            ruleTRANSLATABLEID();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuPackageAccess().getEntriesMenuEntryParserRuleCall_3_9_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); 
             }
 
             }
@@ -58280,32 +58703,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuPackage__EntriesAssignment_3_9"
+    // $ANTLR end "rule__MenuCategory__NameAssignment_1"
 
 
-    // $ANTLR start "rule__MenuEntry__EntryidAssignment_2"
-    // InternalMenuDsl.g:17703:1: rule__MenuEntry__EntryidAssignment_2 : ( ruleTRANSLATABLEID ) ;
-    public final void rule__MenuEntry__EntryidAssignment_2() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__HasTableAssignment_2_0_0"
+    // InternalMenuDsl.g:17830:1: rule__MenuCategory__HasTableAssignment_2_0_0 : ( ( 'table' ) ) ;
+    public final void rule__MenuCategory__HasTableAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17707:1: ( ( ruleTRANSLATABLEID ) )
-            // InternalMenuDsl.g:17708:2: ( ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:17834:1: ( ( ( 'table' ) ) )
+            // InternalMenuDsl.g:17835:2: ( ( 'table' ) )
             {
-            // InternalMenuDsl.g:17708:2: ( ruleTRANSLATABLEID )
-            // InternalMenuDsl.g:17709:3: ruleTRANSLATABLEID
+            // InternalMenuDsl.g:17835:2: ( ( 'table' ) )
+            // InternalMenuDsl.g:17836:3: ( 'table' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getEntryidTRANSLATABLEIDParserRuleCall_2_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); 
+            }
+            // InternalMenuDsl.g:17837:3: ( 'table' )
+            // InternalMenuDsl.g:17838:4: 'table'
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); 
+            }
+            match(input,92,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); 
+            }
+
             }
-            pushFollow(FOLLOW_2);
-            ruleTRANSLATABLEID();
 
-            state._fsp--;
-            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getEntryidTRANSLATABLEIDParserRuleCall_2_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0()); 
             }
 
             }
@@ -58325,40 +58756,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__EntryidAssignment_2"
+    // $ANTLR end "rule__MenuCategory__HasTableAssignment_2_0_0"
 
 
-    // $ANTLR start "rule__MenuEntry__DescriptionAssignment_3_0"
-    // InternalMenuDsl.g:17718:1: rule__MenuEntry__DescriptionAssignment_3_0 : ( ( 'describedBy' ) ) ;
-    public final void rule__MenuEntry__DescriptionAssignment_3_0() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__TableAssignment_2_0_1"
+    // InternalMenuDsl.g:17849:1: rule__MenuCategory__TableAssignment_2_0_1 : ( ( RULE_ID ) ) ;
+    public final void rule__MenuCategory__TableAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17722:1: ( ( ( 'describedBy' ) ) )
-            // InternalMenuDsl.g:17723:2: ( ( 'describedBy' ) )
+            // InternalMenuDsl.g:17853:1: ( ( ( RULE_ID ) ) )
+            // InternalMenuDsl.g:17854:2: ( ( RULE_ID ) )
             {
-            // InternalMenuDsl.g:17723:2: ( ( 'describedBy' ) )
-            // InternalMenuDsl.g:17724:3: ( 'describedBy' )
+            // InternalMenuDsl.g:17854:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:17855:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getTableTableCrossReference_2_0_1_0()); 
             }
-            // InternalMenuDsl.g:17725:3: ( 'describedBy' )
-            // InternalMenuDsl.g:17726:4: 'describedBy'
+            // InternalMenuDsl.g:17856:3: ( RULE_ID )
+            // InternalMenuDsl.g:17857:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getTableTableIDTerminalRuleCall_2_0_1_0_1()); 
             }
-            match(input,91,FOLLOW_2); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getTableTableIDTerminalRuleCall_2_0_1_0_1()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getTableTableCrossReference_2_0_1_0()); 
             }
 
             }
@@ -58378,32 +58809,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__DescriptionAssignment_3_0"
+    // $ANTLR end "rule__MenuCategory__TableAssignment_2_0_1"
 
 
-    // $ANTLR start "rule__MenuEntry__DescriptionValueAssignment_3_1"
-    // InternalMenuDsl.g:17737:1: rule__MenuEntry__DescriptionValueAssignment_3_1 : ( ruleTRANSLATABLESTRING ) ;
-    public final void rule__MenuEntry__DescriptionValueAssignment_3_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__HasDialogAssignment_2_1_0"
+    // InternalMenuDsl.g:17868:1: rule__MenuCategory__HasDialogAssignment_2_1_0 : ( ( 'dialog' ) ) ;
+    public final void rule__MenuCategory__HasDialogAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17741:1: ( ( ruleTRANSLATABLESTRING ) )
-            // InternalMenuDsl.g:17742:2: ( ruleTRANSLATABLESTRING )
+            // InternalMenuDsl.g:17872:1: ( ( ( 'dialog' ) ) )
+            // InternalMenuDsl.g:17873:2: ( ( 'dialog' ) )
             {
-            // InternalMenuDsl.g:17742:2: ( ruleTRANSLATABLESTRING )
-            // InternalMenuDsl.g:17743:3: ruleTRANSLATABLESTRING
+            // InternalMenuDsl.g:17873:2: ( ( 'dialog' ) )
+            // InternalMenuDsl.g:17874:3: ( 'dialog' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); 
+            }
+            // InternalMenuDsl.g:17875:3: ( 'dialog' )
+            // InternalMenuDsl.g:17876:4: 'dialog'
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); 
+            }
+            match(input,93,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); 
+            }
+
             }
-            pushFollow(FOLLOW_2);
-            ruleTRANSLATABLESTRING();
 
-            state._fsp--;
-            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0()); 
             }
 
             }
@@ -58423,40 +58862,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__DescriptionValueAssignment_3_1"
+    // $ANTLR end "rule__MenuCategory__HasDialogAssignment_2_1_0"
 
 
-    // $ANTLR start "rule__MenuEntry__HasImageAssignment_4_0"
-    // InternalMenuDsl.g:17752:1: rule__MenuEntry__HasImageAssignment_4_0 : ( ( 'image' ) ) ;
-    public final void rule__MenuEntry__HasImageAssignment_4_0() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__DialogAssignment_2_1_1"
+    // InternalMenuDsl.g:17887:1: rule__MenuCategory__DialogAssignment_2_1_1 : ( ( RULE_ID ) ) ;
+    public final void rule__MenuCategory__DialogAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17756:1: ( ( ( 'image' ) ) )
-            // InternalMenuDsl.g:17757:2: ( ( 'image' ) )
+            // InternalMenuDsl.g:17891:1: ( ( ( RULE_ID ) ) )
+            // InternalMenuDsl.g:17892:2: ( ( RULE_ID ) )
             {
-            // InternalMenuDsl.g:17757:2: ( ( 'image' ) )
-            // InternalMenuDsl.g:17758:3: ( 'image' )
+            // InternalMenuDsl.g:17892:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:17893:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getDialogDialogCrossReference_2_1_1_0()); 
             }
-            // InternalMenuDsl.g:17759:3: ( 'image' )
-            // InternalMenuDsl.g:17760:4: 'image'
+            // InternalMenuDsl.g:17894:3: ( RULE_ID )
+            // InternalMenuDsl.g:17895:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getDialogDialogIDTerminalRuleCall_2_1_1_0_1()); 
             }
-            match(input,92,FOLLOW_2); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getDialogDialogIDTerminalRuleCall_2_1_1_0_1()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getDialogDialogCrossReference_2_1_1_0()); 
             }
 
             }
@@ -58476,28 +58915,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__HasImageAssignment_4_0"
+    // $ANTLR end "rule__MenuCategory__DialogAssignment_2_1_1"
 
 
-    // $ANTLR start "rule__MenuEntry__ImageAssignment_4_1"
-    // InternalMenuDsl.g:17771:1: rule__MenuEntry__ImageAssignment_4_1 : ( RULE_STRING ) ;
-    public final void rule__MenuEntry__ImageAssignment_4_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__HasUserFilterAssignment_2_2"
+    // InternalMenuDsl.g:17906:1: rule__MenuCategory__HasUserFilterAssignment_2_2 : ( ( 'userFilter' ) ) ;
+    public final void rule__MenuCategory__HasUserFilterAssignment_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17775:1: ( ( RULE_STRING ) )
-            // InternalMenuDsl.g:17776:2: ( RULE_STRING )
+            // InternalMenuDsl.g:17910:1: ( ( ( 'userFilter' ) ) )
+            // InternalMenuDsl.g:17911:2: ( ( 'userFilter' ) )
             {
-            // InternalMenuDsl.g:17776:2: ( RULE_STRING )
-            // InternalMenuDsl.g:17777:3: RULE_STRING
+            // InternalMenuDsl.g:17911:2: ( ( 'userFilter' ) )
+            // InternalMenuDsl.g:17912:3: ( 'userFilter' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getImageSTRINGTerminalRuleCall_4_1_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
+            // InternalMenuDsl.g:17913:3: ( 'userFilter' )
+            // InternalMenuDsl.g:17914:4: 'userFilter'
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); 
+            }
+            match(input,94,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); 
+            }
+
+            }
+
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getImageSTRINGTerminalRuleCall_4_1_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0()); 
             }
 
             }
@@ -58517,40 +58968,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__ImageAssignment_4_1"
+    // $ANTLR end "rule__MenuCategory__HasUserFilterAssignment_2_2"
 
 
-    // $ANTLR start "rule__MenuEntry__ShowBadgeAssignment_5"
-    // InternalMenuDsl.g:17786:1: rule__MenuEntry__ShowBadgeAssignment_5 : ( ( 'showBadge' ) ) ;
-    public final void rule__MenuEntry__ShowBadgeAssignment_5() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__HasReportPrinterAssignment_2_3"
+    // InternalMenuDsl.g:17925:1: rule__MenuCategory__HasReportPrinterAssignment_2_3 : ( ( 'reportPrinter' ) ) ;
+    public final void rule__MenuCategory__HasReportPrinterAssignment_2_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17790:1: ( ( ( 'showBadge' ) ) )
-            // InternalMenuDsl.g:17791:2: ( ( 'showBadge' ) )
+            // InternalMenuDsl.g:17929:1: ( ( ( 'reportPrinter' ) ) )
+            // InternalMenuDsl.g:17930:2: ( ( 'reportPrinter' ) )
             {
-            // InternalMenuDsl.g:17791:2: ( ( 'showBadge' ) )
-            // InternalMenuDsl.g:17792:3: ( 'showBadge' )
+            // InternalMenuDsl.g:17930:2: ( ( 'reportPrinter' ) )
+            // InternalMenuDsl.g:17931:3: ( 'reportPrinter' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); 
             }
-            // InternalMenuDsl.g:17793:3: ( 'showBadge' )
-            // InternalMenuDsl.g:17794:4: 'showBadge'
+            // InternalMenuDsl.g:17932:3: ( 'reportPrinter' )
+            // InternalMenuDsl.g:17933:4: 'reportPrinter'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); 
             }
-            match(input,93,FOLLOW_2); if (state.failed) return ;
+            match(input,95,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0()); 
             }
 
             }
@@ -58570,40 +59021,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__ShowBadgeAssignment_5"
+    // $ANTLR end "rule__MenuCategory__HasReportPrinterAssignment_2_3"
 
 
-    // $ANTLR start "rule__MenuEntry__HasProcessAssignment_6_0_0"
-    // InternalMenuDsl.g:17805:1: rule__MenuEntry__HasProcessAssignment_6_0_0 : ( ( 'process' ) ) ;
-    public final void rule__MenuEntry__HasProcessAssignment_6_0_0() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__HasKeyBindingAssignment_2_4"
+    // InternalMenuDsl.g:17944:1: rule__MenuCategory__HasKeyBindingAssignment_2_4 : ( ( 'keyBinding' ) ) ;
+    public final void rule__MenuCategory__HasKeyBindingAssignment_2_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17809:1: ( ( ( 'process' ) ) )
-            // InternalMenuDsl.g:17810:2: ( ( 'process' ) )
+            // InternalMenuDsl.g:17948:1: ( ( ( 'keyBinding' ) ) )
+            // InternalMenuDsl.g:17949:2: ( ( 'keyBinding' ) )
             {
-            // InternalMenuDsl.g:17810:2: ( ( 'process' ) )
-            // InternalMenuDsl.g:17811:3: ( 'process' )
+            // InternalMenuDsl.g:17949:2: ( ( 'keyBinding' ) )
+            // InternalMenuDsl.g:17950:3: ( 'keyBinding' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); 
             }
-            // InternalMenuDsl.g:17812:3: ( 'process' )
-            // InternalMenuDsl.g:17813:4: 'process'
+            // InternalMenuDsl.g:17951:3: ( 'keyBinding' )
+            // InternalMenuDsl.g:17952:4: 'keyBinding'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); 
             }
-            match(input,94,FOLLOW_2); if (state.failed) return ;
+            match(input,96,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0()); 
             }
 
             }
@@ -58623,40 +59074,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__HasProcessAssignment_6_0_0"
+    // $ANTLR end "rule__MenuCategory__HasKeyBindingAssignment_2_4"
 
 
-    // $ANTLR start "rule__MenuEntry__ProcessAssignment_6_0_1"
-    // InternalMenuDsl.g:17824:1: rule__MenuEntry__ProcessAssignment_6_0_1 : ( ( RULE_ID ) ) ;
-    public final void rule__MenuEntry__ProcessAssignment_6_0_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__HasSystemSettingsAssignment_2_5"
+    // InternalMenuDsl.g:17963:1: rule__MenuCategory__HasSystemSettingsAssignment_2_5 : ( ( 'systemSettings' ) ) ;
+    public final void rule__MenuCategory__HasSystemSettingsAssignment_2_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17828:1: ( ( ( RULE_ID ) ) )
-            // InternalMenuDsl.g:17829:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:17967:1: ( ( ( 'systemSettings' ) ) )
+            // InternalMenuDsl.g:17968:2: ( ( 'systemSettings' ) )
             {
-            // InternalMenuDsl.g:17829:2: ( ( RULE_ID ) )
-            // InternalMenuDsl.g:17830:3: ( RULE_ID )
+            // InternalMenuDsl.g:17968:2: ( ( 'systemSettings' ) )
+            // InternalMenuDsl.g:17969:3: ( 'systemSettings' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_6_0_1_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); 
             }
-            // InternalMenuDsl.g:17831:3: ( RULE_ID )
-            // InternalMenuDsl.g:17832:4: RULE_ID
+            // InternalMenuDsl.g:17970:3: ( 'systemSettings' )
+            // InternalMenuDsl.g:17971:4: 'systemSettings'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_6_0_1_0_1()); 
+               before(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); 
             }
-            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
+            match(input,97,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_6_0_1_0_1()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_6_0_1_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0()); 
             }
 
             }
@@ -58676,40 +59127,77 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__ProcessAssignment_6_0_1"
+    // $ANTLR end "rule__MenuCategory__HasSystemSettingsAssignment_2_5"
 
 
-    // $ANTLR start "rule__MenuEntry__HasPerspectiveAssignment_6_1_0"
-    // InternalMenuDsl.g:17843:1: rule__MenuEntry__HasPerspectiveAssignment_6_1_0 : ( ( 'perspective' ) ) ;
-    public final void rule__MenuEntry__HasPerspectiveAssignment_6_1_0() throws RecognitionException {
+    // $ANTLR start "rule__MenuCategory__TreesAssignment_2_6_1"
+    // InternalMenuDsl.g:17982:1: rule__MenuCategory__TreesAssignment_2_6_1 : ( ruleMenuTree ) ;
+    public final void rule__MenuCategory__TreesAssignment_2_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17847:1: ( ( ( 'perspective' ) ) )
-            // InternalMenuDsl.g:17848:2: ( ( 'perspective' ) )
+            // InternalMenuDsl.g:17986:1: ( ( ruleMenuTree ) )
+            // InternalMenuDsl.g:17987:2: ( ruleMenuTree )
             {
-            // InternalMenuDsl.g:17848:2: ( ( 'perspective' ) )
-            // InternalMenuDsl.g:17849:3: ( 'perspective' )
+            // InternalMenuDsl.g:17987:2: ( ruleMenuTree )
+            // InternalMenuDsl.g:17988:3: ruleMenuTree
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); 
+               before(grammarAccess.getMenuCategoryAccess().getTreesMenuTreeParserRuleCall_2_6_1_0()); 
             }
-            // InternalMenuDsl.g:17850:3: ( 'perspective' )
-            // InternalMenuDsl.g:17851:4: 'perspective'
-            {
+            pushFollow(FOLLOW_2);
+            ruleMenuTree();
+
+            state._fsp--;
+            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); 
+               after(grammarAccess.getMenuCategoryAccess().getTreesMenuTreeParserRuleCall_2_6_1_0()); 
             }
-            match(input,95,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); 
+
             }
 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuCategory__TreesAssignment_2_6_1"
+
+
+    // $ANTLR start "rule__MenuTree__NameAssignment_1"
+    // InternalMenuDsl.g:17997:1: rule__MenuTree__NameAssignment_1 : ( ruleTRANSLATABLEID ) ;
+    public final void rule__MenuTree__NameAssignment_1() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:18001:1: ( ( ruleTRANSLATABLEID ) )
+            // InternalMenuDsl.g:18002:2: ( ruleTRANSLATABLEID )
+            {
+            // InternalMenuDsl.g:18002:2: ( ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:18003:3: ruleTRANSLATABLEID
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuTreeAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); 
             }
+            pushFollow(FOLLOW_2);
+            ruleTRANSLATABLEID();
 
+            state._fsp--;
+            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0()); 
+               after(grammarAccess.getMenuTreeAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); 
             }
 
             }
@@ -58729,40 +59217,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__HasPerspectiveAssignment_6_1_0"
+    // $ANTLR end "rule__MenuTree__NameAssignment_1"
 
 
-    // $ANTLR start "rule__MenuEntry__PerspectiveAssignment_6_1_1"
-    // InternalMenuDsl.g:17862:1: rule__MenuEntry__PerspectiveAssignment_6_1_1 : ( ( RULE_ID ) ) ;
-    public final void rule__MenuEntry__PerspectiveAssignment_6_1_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__HasTooltipAssignment_2_0"
+    // InternalMenuDsl.g:18012:1: rule__MenuTree__HasTooltipAssignment_2_0 : ( ( 'tooltip' ) ) ;
+    public final void rule__MenuTree__HasTooltipAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17866:1: ( ( ( RULE_ID ) ) )
-            // InternalMenuDsl.g:17867:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:18016:1: ( ( ( 'tooltip' ) ) )
+            // InternalMenuDsl.g:18017:2: ( ( 'tooltip' ) )
             {
-            // InternalMenuDsl.g:17867:2: ( ( RULE_ID ) )
-            // InternalMenuDsl.g:17868:3: ( RULE_ID )
+            // InternalMenuDsl.g:18017:2: ( ( 'tooltip' ) )
+            // InternalMenuDsl.g:18018:3: ( 'tooltip' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_6_1_1_0()); 
+               before(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); 
             }
-            // InternalMenuDsl.g:17869:3: ( RULE_ID )
-            // InternalMenuDsl.g:17870:4: RULE_ID
+            // InternalMenuDsl.g:18019:3: ( 'tooltip' )
+            // InternalMenuDsl.g:18020:4: 'tooltip'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_6_1_1_0_1()); 
+               before(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
+            match(input,98,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_6_1_1_0_1()); 
+               after(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_6_1_1_0()); 
+               after(grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0()); 
             }
 
             }
@@ -58782,40 +59270,122 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__PerspectiveAssignment_6_1_1"
+    // $ANTLR end "rule__MenuTree__HasTooltipAssignment_2_0"
 
 
-    // $ANTLR start "rule__MenuEntry__HasTableAssignment_6_2_0"
-    // InternalMenuDsl.g:17881:1: rule__MenuEntry__HasTableAssignment_6_2_0 : ( ( 'table' ) ) ;
-    public final void rule__MenuEntry__HasTableAssignment_6_2_0() throws RecognitionException {
+    // $ANTLR start "rule__MenuTree__TooltipAssignment_2_1"
+    // InternalMenuDsl.g:18031:1: rule__MenuTree__TooltipAssignment_2_1 : ( ruleTRANSLATABLESTRING ) ;
+    public final void rule__MenuTree__TooltipAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17885:1: ( ( ( 'table' ) ) )
-            // InternalMenuDsl.g:17886:2: ( ( 'table' ) )
+            // InternalMenuDsl.g:18035:1: ( ( ruleTRANSLATABLESTRING ) )
+            // InternalMenuDsl.g:18036:2: ( ruleTRANSLATABLESTRING )
             {
-            // InternalMenuDsl.g:17886:2: ( ( 'table' ) )
-            // InternalMenuDsl.g:17887:3: ( 'table' )
+            // InternalMenuDsl.g:18036:2: ( ruleTRANSLATABLESTRING )
+            // InternalMenuDsl.g:18037:3: ruleTRANSLATABLESTRING
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); 
+               before(grammarAccess.getMenuTreeAccess().getTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0()); 
+            }
+            pushFollow(FOLLOW_2);
+            ruleTRANSLATABLESTRING();
+
+            state._fsp--;
+            if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuTreeAccess().getTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0()); 
+            }
+
             }
-            // InternalMenuDsl.g:17888:3: ( 'table' )
-            // InternalMenuDsl.g:17889:4: 'table'
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuTree__TooltipAssignment_2_1"
+
+
+    // $ANTLR start "rule__MenuTree__EntriesAssignment_4"
+    // InternalMenuDsl.g:18046:1: rule__MenuTree__EntriesAssignment_4 : ( ruleMenuEntry ) ;
+    public final void rule__MenuTree__EntriesAssignment_4() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:18050:1: ( ( ruleMenuEntry ) )
+            // InternalMenuDsl.g:18051:2: ( ruleMenuEntry )
+            {
+            // InternalMenuDsl.g:18051:2: ( ruleMenuEntry )
+            // InternalMenuDsl.g:18052:3: ruleMenuEntry
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); 
+               before(grammarAccess.getMenuTreeAccess().getEntriesMenuEntryParserRuleCall_4_0()); 
             }
-            match(input,96,FOLLOW_2); if (state.failed) return ;
+            pushFollow(FOLLOW_2);
+            ruleMenuEntry();
+
+            state._fsp--;
+            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); 
+               after(grammarAccess.getMenuTreeAccess().getEntriesMenuEntryParserRuleCall_4_0()); 
             }
 
             }
 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__MenuTree__EntriesAssignment_4"
+
+
+    // $ANTLR start "rule__MenuEntry__NameAssignment_1"
+    // InternalMenuDsl.g:18061:1: rule__MenuEntry__NameAssignment_1 : ( ruleTRANSLATABLEID ) ;
+    public final void rule__MenuEntry__NameAssignment_1() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+        	
+        try {
+            // InternalMenuDsl.g:18065:1: ( ( ruleTRANSLATABLEID ) )
+            // InternalMenuDsl.g:18066:2: ( ruleTRANSLATABLEID )
+            {
+            // InternalMenuDsl.g:18066:2: ( ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:18067:3: ruleTRANSLATABLEID
+            {
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0()); 
+               before(grammarAccess.getMenuEntryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); 
+            }
+            pushFollow(FOLLOW_2);
+            ruleTRANSLATABLEID();
+
+            state._fsp--;
+            if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuEntryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0()); 
             }
 
             }
@@ -58835,40 +59405,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__HasTableAssignment_6_2_0"
+    // $ANTLR end "rule__MenuEntry__NameAssignment_1"
 
 
-    // $ANTLR start "rule__MenuEntry__TableAssignment_6_2_1"
-    // InternalMenuDsl.g:17900:1: rule__MenuEntry__TableAssignment_6_2_1 : ( ( RULE_ID ) ) ;
-    public final void rule__MenuEntry__TableAssignment_6_2_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__HasIconAssignment_2_0"
+    // InternalMenuDsl.g:18076:1: rule__MenuEntry__HasIconAssignment_2_0 : ( ( 'icon' ) ) ;
+    public final void rule__MenuEntry__HasIconAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17904:1: ( ( ( RULE_ID ) ) )
-            // InternalMenuDsl.g:17905:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:18080:1: ( ( ( 'icon' ) ) )
+            // InternalMenuDsl.g:18081:2: ( ( 'icon' ) )
             {
-            // InternalMenuDsl.g:17905:2: ( ( RULE_ID ) )
-            // InternalMenuDsl.g:17906:3: ( RULE_ID )
+            // InternalMenuDsl.g:18081:2: ( ( 'icon' ) )
+            // InternalMenuDsl.g:18082:3: ( 'icon' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getTableTableCrossReference_6_2_1_0()); 
+               before(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); 
             }
-            // InternalMenuDsl.g:17907:3: ( RULE_ID )
-            // InternalMenuDsl.g:17908:4: RULE_ID
+            // InternalMenuDsl.g:18083:3: ( 'icon' )
+            // InternalMenuDsl.g:18084:4: 'icon'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getTableTableIDTerminalRuleCall_6_2_1_0_1()); 
+               before(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
+            match(input,99,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getTableTableIDTerminalRuleCall_6_2_1_0_1()); 
+               after(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getTableTableCrossReference_6_2_1_0()); 
+               after(grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0()); 
             }
 
             }
@@ -58888,40 +59458,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__TableAssignment_6_2_1"
+    // $ANTLR end "rule__MenuEntry__HasIconAssignment_2_0"
 
 
-    // $ANTLR start "rule__MenuEntry__HasDialogAssignment_6_3_0"
-    // InternalMenuDsl.g:17919:1: rule__MenuEntry__HasDialogAssignment_6_3_0 : ( ( 'dialog' ) ) ;
-    public final void rule__MenuEntry__HasDialogAssignment_6_3_0() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__IconAssignment_2_1"
+    // InternalMenuDsl.g:18095:1: rule__MenuEntry__IconAssignment_2_1 : ( RULE_STRING ) ;
+    public final void rule__MenuEntry__IconAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17923:1: ( ( ( 'dialog' ) ) )
-            // InternalMenuDsl.g:17924:2: ( ( 'dialog' ) )
-            {
-            // InternalMenuDsl.g:17924:2: ( ( 'dialog' ) )
-            // InternalMenuDsl.g:17925:3: ( 'dialog' )
+            // InternalMenuDsl.g:18099:1: ( ( RULE_STRING ) )
+            // InternalMenuDsl.g:18100:2: ( RULE_STRING )
             {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); 
-            }
-            // InternalMenuDsl.g:17926:3: ( 'dialog' )
-            // InternalMenuDsl.g:17927:4: 'dialog'
+            // InternalMenuDsl.g:18100:2: ( RULE_STRING )
+            // InternalMenuDsl.g:18101:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); 
-            }
-            match(input,97,FOLLOW_2); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); 
+               before(grammarAccess.getMenuEntryAccess().getIconSTRINGTerminalRuleCall_2_1_0()); 
             }
-
-            }
-
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0()); 
+               after(grammarAccess.getMenuEntryAccess().getIconSTRINGTerminalRuleCall_2_1_0()); 
             }
 
             }
@@ -58941,40 +59499,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__HasDialogAssignment_6_3_0"
+    // $ANTLR end "rule__MenuEntry__IconAssignment_2_1"
 
 
-    // $ANTLR start "rule__MenuEntry__DialogAssignment_6_3_1"
-    // InternalMenuDsl.g:17938:1: rule__MenuEntry__DialogAssignment_6_3_1 : ( ( RULE_ID ) ) ;
-    public final void rule__MenuEntry__DialogAssignment_6_3_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__HasProcessAssignment_3_0_0"
+    // InternalMenuDsl.g:18110:1: rule__MenuEntry__HasProcessAssignment_3_0_0 : ( ( 'process' ) ) ;
+    public final void rule__MenuEntry__HasProcessAssignment_3_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17942:1: ( ( ( RULE_ID ) ) )
-            // InternalMenuDsl.g:17943:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:18114:1: ( ( ( 'process' ) ) )
+            // InternalMenuDsl.g:18115:2: ( ( 'process' ) )
             {
-            // InternalMenuDsl.g:17943:2: ( ( RULE_ID ) )
-            // InternalMenuDsl.g:17944:3: ( RULE_ID )
+            // InternalMenuDsl.g:18115:2: ( ( 'process' ) )
+            // InternalMenuDsl.g:18116:3: ( 'process' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDialogDialogCrossReference_6_3_1_0()); 
+               before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); 
             }
-            // InternalMenuDsl.g:17945:3: ( RULE_ID )
-            // InternalMenuDsl.g:17946:4: RULE_ID
+            // InternalMenuDsl.g:18117:3: ( 'process' )
+            // InternalMenuDsl.g:18118:4: 'process'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getDialogDialogIDTerminalRuleCall_6_3_1_0_1()); 
+               before(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
+            match(input,100,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDialogDialogIDTerminalRuleCall_6_3_1_0_1()); 
+               after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getDialogDialogCrossReference_6_3_1_0()); 
+               after(grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0()); 
             }
 
             }
@@ -58994,40 +59552,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__DialogAssignment_6_3_1"
+    // $ANTLR end "rule__MenuEntry__HasProcessAssignment_3_0_0"
 
 
-    // $ANTLR start "rule__MenuEntry__HasUserFilterAssignment_6_4"
-    // InternalMenuDsl.g:17957:1: rule__MenuEntry__HasUserFilterAssignment_6_4 : ( ( 'userFilter' ) ) ;
-    public final void rule__MenuEntry__HasUserFilterAssignment_6_4() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__ProcessAssignment_3_0_1"
+    // InternalMenuDsl.g:18129:1: rule__MenuEntry__ProcessAssignment_3_0_1 : ( ( RULE_ID ) ) ;
+    public final void rule__MenuEntry__ProcessAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17961:1: ( ( ( 'userFilter' ) ) )
-            // InternalMenuDsl.g:17962:2: ( ( 'userFilter' ) )
+            // InternalMenuDsl.g:18133:1: ( ( ( RULE_ID ) ) )
+            // InternalMenuDsl.g:18134:2: ( ( RULE_ID ) )
             {
-            // InternalMenuDsl.g:17962:2: ( ( 'userFilter' ) )
-            // InternalMenuDsl.g:17963:3: ( 'userFilter' )
+            // InternalMenuDsl.g:18134:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:18135:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); 
+               before(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_3_0_1_0()); 
             }
-            // InternalMenuDsl.g:17964:3: ( 'userFilter' )
-            // InternalMenuDsl.g:17965:4: 'userFilter'
+            // InternalMenuDsl.g:18136:3: ( RULE_ID )
+            // InternalMenuDsl.g:18137:4: RULE_ID
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); 
+               before(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_3_0_1_0_1()); 
             }
-            match(input,98,FOLLOW_2); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); 
+               after(grammarAccess.getMenuEntryAccess().getProcessBlipIDTerminalRuleCall_3_0_1_0_1()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0()); 
+               after(grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_3_0_1_0()); 
             }
 
             }
@@ -59047,40 +59605,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__HasUserFilterAssignment_6_4"
+    // $ANTLR end "rule__MenuEntry__ProcessAssignment_3_0_1"
 
 
-    // $ANTLR start "rule__MenuEntry__HasKeyBindingAssignment_6_5"
-    // InternalMenuDsl.g:17976:1: rule__MenuEntry__HasKeyBindingAssignment_6_5 : ( ( 'keyBinding' ) ) ;
-    public final void rule__MenuEntry__HasKeyBindingAssignment_6_5() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__HasPerspectiveAssignment_3_1_0"
+    // InternalMenuDsl.g:18148:1: rule__MenuEntry__HasPerspectiveAssignment_3_1_0 : ( ( 'perspective' ) ) ;
+    public final void rule__MenuEntry__HasPerspectiveAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17980:1: ( ( ( 'keyBinding' ) ) )
-            // InternalMenuDsl.g:17981:2: ( ( 'keyBinding' ) )
+            // InternalMenuDsl.g:18152:1: ( ( ( 'perspective' ) ) )
+            // InternalMenuDsl.g:18153:2: ( ( 'perspective' ) )
             {
-            // InternalMenuDsl.g:17981:2: ( ( 'keyBinding' ) )
-            // InternalMenuDsl.g:17982:3: ( 'keyBinding' )
+            // InternalMenuDsl.g:18153:2: ( ( 'perspective' ) )
+            // InternalMenuDsl.g:18154:3: ( 'perspective' )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); 
+               before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); 
             }
-            // InternalMenuDsl.g:17983:3: ( 'keyBinding' )
-            // InternalMenuDsl.g:17984:4: 'keyBinding'
+            // InternalMenuDsl.g:18155:3: ( 'perspective' )
+            // InternalMenuDsl.g:18156:4: 'perspective'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); 
+               before(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); 
             }
-            match(input,99,FOLLOW_2); if (state.failed) return ;
+            match(input,101,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); 
+               after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0()); 
+               after(grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0()); 
             }
 
             }
@@ -59100,32 +59658,40 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__HasKeyBindingAssignment_6_5"
+    // $ANTLR end "rule__MenuEntry__HasPerspectiveAssignment_3_1_0"
 
 
-    // $ANTLR start "rule__MenuEntry__SubentriesAssignment_7_1"
-    // InternalMenuDsl.g:17995:1: rule__MenuEntry__SubentriesAssignment_7_1 : ( ruleMenuEntry ) ;
-    public final void rule__MenuEntry__SubentriesAssignment_7_1() throws RecognitionException {
+    // $ANTLR start "rule__MenuEntry__PerspectiveAssignment_3_1_1"
+    // InternalMenuDsl.g:18167:1: rule__MenuEntry__PerspectiveAssignment_3_1_1 : ( ( RULE_ID ) ) ;
+    public final void rule__MenuEntry__PerspectiveAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:17999:1: ( ( ruleMenuEntry ) )
-            // InternalMenuDsl.g:18000:2: ( ruleMenuEntry )
+            // InternalMenuDsl.g:18171:1: ( ( ( RULE_ID ) ) )
+            // InternalMenuDsl.g:18172:2: ( ( RULE_ID ) )
             {
-            // InternalMenuDsl.g:18000:2: ( ruleMenuEntry )
-            // InternalMenuDsl.g:18001:3: ruleMenuEntry
+            // InternalMenuDsl.g:18172:2: ( ( RULE_ID ) )
+            // InternalMenuDsl.g:18173:3: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMenuEntryAccess().getSubentriesMenuEntryParserRuleCall_7_1_0()); 
+               before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_3_1_1_0()); 
+            }
+            // InternalMenuDsl.g:18174:3: ( RULE_ID )
+            // InternalMenuDsl.g:18175:4: RULE_ID
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_3_1_1_0_1()); 
+            }
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveIDTerminalRuleCall_3_1_1_0_1()); 
+            }
+
             }
-            pushFollow(FOLLOW_2);
-            ruleMenuEntry();
 
-            state._fsp--;
-            if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMenuEntryAccess().getSubentriesMenuEntryParserRuleCall_7_1_0()); 
+               after(grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_3_1_1_0()); 
             }
 
             }
@@ -59145,27 +59711,27 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MenuEntry__SubentriesAssignment_7_1"
+    // $ANTLR end "rule__MenuEntry__PerspectiveAssignment_3_1_1"
 
 
     // $ANTLR start "rule__XImportDeclaration__StaticAssignment_2_0_0"
-    // InternalMenuDsl.g:18010:1: rule__XImportDeclaration__StaticAssignment_2_0_0 : ( ( 'static' ) ) ;
+    // InternalMenuDsl.g:18186:1: rule__XImportDeclaration__StaticAssignment_2_0_0 : ( ( 'static' ) ) ;
     public final void rule__XImportDeclaration__StaticAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18014:1: ( ( ( 'static' ) ) )
-            // InternalMenuDsl.g:18015:2: ( ( 'static' ) )
+            // InternalMenuDsl.g:18190:1: ( ( ( 'static' ) ) )
+            // InternalMenuDsl.g:18191:2: ( ( 'static' ) )
             {
-            // InternalMenuDsl.g:18015:2: ( ( 'static' ) )
-            // InternalMenuDsl.g:18016:3: ( 'static' )
+            // InternalMenuDsl.g:18191:2: ( ( 'static' ) )
+            // InternalMenuDsl.g:18192:3: ( 'static' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_2_0_0_0()); 
             }
-            // InternalMenuDsl.g:18017:3: ( 'static' )
-            // InternalMenuDsl.g:18018:4: 'static'
+            // InternalMenuDsl.g:18193:3: ( 'static' )
+            // InternalMenuDsl.g:18194:4: 'static'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_2_0_0_0()); 
@@ -59202,23 +59768,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__ExtensionAssignment_2_0_1"
-    // InternalMenuDsl.g:18029:1: rule__XImportDeclaration__ExtensionAssignment_2_0_1 : ( ( 'extension' ) ) ;
+    // InternalMenuDsl.g:18205:1: rule__XImportDeclaration__ExtensionAssignment_2_0_1 : ( ( 'extension' ) ) ;
     public final void rule__XImportDeclaration__ExtensionAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18033:1: ( ( ( 'extension' ) ) )
-            // InternalMenuDsl.g:18034:2: ( ( 'extension' ) )
+            // InternalMenuDsl.g:18209:1: ( ( ( 'extension' ) ) )
+            // InternalMenuDsl.g:18210:2: ( ( 'extension' ) )
             {
-            // InternalMenuDsl.g:18034:2: ( ( 'extension' ) )
-            // InternalMenuDsl.g:18035:3: ( 'extension' )
+            // InternalMenuDsl.g:18210:2: ( ( 'extension' ) )
+            // InternalMenuDsl.g:18211:3: ( 'extension' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_2_0_1_0()); 
             }
-            // InternalMenuDsl.g:18036:3: ( 'extension' )
-            // InternalMenuDsl.g:18037:4: 'extension'
+            // InternalMenuDsl.g:18212:3: ( 'extension' )
+            // InternalMenuDsl.g:18213:4: 'extension'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_2_0_1_0()); 
@@ -59255,23 +59821,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_2_0_2"
-    // InternalMenuDsl.g:18048:1: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
+    // InternalMenuDsl.g:18224:1: rule__XImportDeclaration__ImportedTypeAssignment_2_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_2_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18052:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
-            // InternalMenuDsl.g:18053:2: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalMenuDsl.g:18228:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
+            // InternalMenuDsl.g:18229:2: ( ( ruleQualifiedNameInStaticImport ) )
             {
-            // InternalMenuDsl.g:18053:2: ( ( ruleQualifiedNameInStaticImport ) )
-            // InternalMenuDsl.g:18054:3: ( ruleQualifiedNameInStaticImport )
+            // InternalMenuDsl.g:18229:2: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalMenuDsl.g:18230:3: ( ruleQualifiedNameInStaticImport )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_0_2_0()); 
             }
-            // InternalMenuDsl.g:18055:3: ( ruleQualifiedNameInStaticImport )
-            // InternalMenuDsl.g:18056:4: ruleQualifiedNameInStaticImport
+            // InternalMenuDsl.g:18231:3: ( ruleQualifiedNameInStaticImport )
+            // InternalMenuDsl.g:18232:4: ruleQualifiedNameInStaticImport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameInStaticImportParserRuleCall_2_0_2_0_1()); 
@@ -59312,23 +59878,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__WildcardAssignment_2_0_3_0"
-    // InternalMenuDsl.g:18067:1: rule__XImportDeclaration__WildcardAssignment_2_0_3_0 : ( ( '*' ) ) ;
+    // InternalMenuDsl.g:18243:1: rule__XImportDeclaration__WildcardAssignment_2_0_3_0 : ( ( '*' ) ) ;
     public final void rule__XImportDeclaration__WildcardAssignment_2_0_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18071:1: ( ( ( '*' ) ) )
-            // InternalMenuDsl.g:18072:2: ( ( '*' ) )
+            // InternalMenuDsl.g:18247:1: ( ( ( '*' ) ) )
+            // InternalMenuDsl.g:18248:2: ( ( '*' ) )
             {
-            // InternalMenuDsl.g:18072:2: ( ( '*' ) )
-            // InternalMenuDsl.g:18073:3: ( '*' )
+            // InternalMenuDsl.g:18248:2: ( ( '*' ) )
+            // InternalMenuDsl.g:18249:3: ( '*' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_2_0_3_0_0()); 
             }
-            // InternalMenuDsl.g:18074:3: ( '*' )
-            // InternalMenuDsl.g:18075:4: '*'
+            // InternalMenuDsl.g:18250:3: ( '*' )
+            // InternalMenuDsl.g:18251:4: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_2_0_3_0_0()); 
@@ -59365,17 +59931,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__MemberNameAssignment_2_0_3_1"
-    // InternalMenuDsl.g:18086:1: rule__XImportDeclaration__MemberNameAssignment_2_0_3_1 : ( ruleValidID ) ;
+    // InternalMenuDsl.g:18262: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 {
-            // InternalMenuDsl.g:18090:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:18091:2: ( ruleValidID )
+            // InternalMenuDsl.g:18266:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:18267:2: ( ruleValidID )
             {
-            // InternalMenuDsl.g:18091:2: ( ruleValidID )
-            // InternalMenuDsl.g:18092:3: ruleValidID
+            // InternalMenuDsl.g:18267:2: ( ruleValidID )
+            // InternalMenuDsl.g:18268:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_2_0_3_1_0()); 
@@ -59410,23 +59976,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_2_1"
-    // InternalMenuDsl.g:18101:1: rule__XImportDeclaration__ImportedTypeAssignment_2_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalMenuDsl.g:18277:1: rule__XImportDeclaration__ImportedTypeAssignment_2_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18105:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalMenuDsl.g:18106:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:18281:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalMenuDsl.g:18282:2: ( ( ruleQualifiedName ) )
             {
-            // InternalMenuDsl.g:18106:2: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:18107:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:18282:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:18283:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_1_0()); 
             }
-            // InternalMenuDsl.g:18108:3: ( ruleQualifiedName )
-            // InternalMenuDsl.g:18109:4: ruleQualifiedName
+            // InternalMenuDsl.g:18284:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:18285:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameParserRuleCall_2_1_0_1()); 
@@ -59467,17 +60033,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedNamespaceAssignment_2_2"
-    // InternalMenuDsl.g:18120:1: rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 : ( ruleQualifiedNameWithWildcard ) ;
+    // InternalMenuDsl.g:18296:1: rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 : ( ruleQualifiedNameWithWildcard ) ;
     public final void rule__XImportDeclaration__ImportedNamespaceAssignment_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18124:1: ( ( ruleQualifiedNameWithWildcard ) )
-            // InternalMenuDsl.g:18125:2: ( ruleQualifiedNameWithWildcard )
+            // InternalMenuDsl.g:18300:1: ( ( ruleQualifiedNameWithWildcard ) )
+            // InternalMenuDsl.g:18301:2: ( ruleQualifiedNameWithWildcard )
             {
-            // InternalMenuDsl.g:18125:2: ( ruleQualifiedNameWithWildcard )
-            // InternalMenuDsl.g:18126:3: ruleQualifiedNameWithWildcard
+            // InternalMenuDsl.g:18301:2: ( ruleQualifiedNameWithWildcard )
+            // InternalMenuDsl.g:18302:3: ruleQualifiedNameWithWildcard
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_2_2_0()); 
@@ -59512,28 +60078,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__FqnImportAssignment_2_3_0"
-    // InternalMenuDsl.g:18135:1: rule__XImportDeclaration__FqnImportAssignment_2_3_0 : ( ( 'ns' ) ) ;
+    // InternalMenuDsl.g:18311:1: rule__XImportDeclaration__FqnImportAssignment_2_3_0 : ( ( 'ns' ) ) ;
     public final void rule__XImportDeclaration__FqnImportAssignment_2_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18139:1: ( ( ( 'ns' ) ) )
-            // InternalMenuDsl.g:18140:2: ( ( 'ns' ) )
+            // InternalMenuDsl.g:18315:1: ( ( ( 'ns' ) ) )
+            // InternalMenuDsl.g:18316:2: ( ( 'ns' ) )
             {
-            // InternalMenuDsl.g:18140:2: ( ( 'ns' ) )
-            // InternalMenuDsl.g:18141:3: ( 'ns' )
+            // InternalMenuDsl.g:18316:2: ( ( 'ns' ) )
+            // InternalMenuDsl.g:18317:3: ( 'ns' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); 
             }
-            // InternalMenuDsl.g:18142:3: ( 'ns' )
-            // InternalMenuDsl.g:18143:4: 'ns'
+            // InternalMenuDsl.g:18318:3: ( 'ns' )
+            // InternalMenuDsl.g:18319:4: 'ns'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); 
             }
-            match(input,100,FOLLOW_2); if (state.failed) return ;
+            match(input,102,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); 
             }
@@ -59565,17 +60131,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1"
-    // InternalMenuDsl.g:18154:1: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 : ( ruleQualifiedName ) ;
+    // InternalMenuDsl.g:18330:1: rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1 : ( ruleQualifiedName ) ;
     public final void rule__XImportDeclaration__ImportedFullyQualifiedNameAssignment_2_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18158:1: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:18159:2: ( ruleQualifiedName )
+            // InternalMenuDsl.g:18334:1: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:18335:2: ( ruleQualifiedName )
             {
-            // InternalMenuDsl.g:18159:2: ( ruleQualifiedName )
-            // InternalMenuDsl.g:18160:3: ruleQualifiedName
+            // InternalMenuDsl.g:18335:2: ( ruleQualifiedName )
+            // InternalMenuDsl.g:18336:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedFullyQualifiedNameQualifiedNameParserRuleCall_2_3_1_0()); 
@@ -59610,23 +60176,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__AnnotationTypeAssignment_2"
-    // InternalMenuDsl.g:18169:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalMenuDsl.g:18345:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18173:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalMenuDsl.g:18174:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:18349:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalMenuDsl.g:18350:2: ( ( ruleQualifiedName ) )
             {
-            // InternalMenuDsl.g:18174:2: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:18175:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:18350:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:18351:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
             }
-            // InternalMenuDsl.g:18176:3: ( ruleQualifiedName )
-            // InternalMenuDsl.g:18177:4: ruleQualifiedName
+            // InternalMenuDsl.g:18352:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:18353:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeQualifiedNameParserRuleCall_2_0_1()); 
@@ -59667,17 +60233,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0"
-    // InternalMenuDsl.g:18188:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalMenuDsl.g:18364: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 {
-            // InternalMenuDsl.g:18192:1: ( ( ruleXAnnotationElementValuePair ) )
-            // InternalMenuDsl.g:18193:2: ( ruleXAnnotationElementValuePair )
+            // InternalMenuDsl.g:18368:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalMenuDsl.g:18369:2: ( ruleXAnnotationElementValuePair )
             {
-            // InternalMenuDsl.g:18193:2: ( ruleXAnnotationElementValuePair )
-            // InternalMenuDsl.g:18194:3: ruleXAnnotationElementValuePair
+            // InternalMenuDsl.g:18369:2: ( ruleXAnnotationElementValuePair )
+            // InternalMenuDsl.g:18370:3: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
@@ -59712,17 +60278,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1"
-    // InternalMenuDsl.g:18203:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalMenuDsl.g:18379: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 {
-            // InternalMenuDsl.g:18207:1: ( ( ruleXAnnotationElementValuePair ) )
-            // InternalMenuDsl.g:18208:2: ( ruleXAnnotationElementValuePair )
+            // InternalMenuDsl.g:18383:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalMenuDsl.g:18384:2: ( ruleXAnnotationElementValuePair )
             {
-            // InternalMenuDsl.g:18208:2: ( ruleXAnnotationElementValuePair )
-            // InternalMenuDsl.g:18209:3: ruleXAnnotationElementValuePair
+            // InternalMenuDsl.g:18384:2: ( ruleXAnnotationElementValuePair )
+            // InternalMenuDsl.g:18385:3: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
@@ -59757,17 +60323,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotation__ValueAssignment_3_1_1"
-    // InternalMenuDsl.g:18218:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
+    // InternalMenuDsl.g:18394:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
     public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18222:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
-            // InternalMenuDsl.g:18223:2: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalMenuDsl.g:18398:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
+            // InternalMenuDsl.g:18399:2: ( ruleXAnnotationElementValueOrCommaList )
             {
-            // InternalMenuDsl.g:18223:2: ( ruleXAnnotationElementValueOrCommaList )
-            // InternalMenuDsl.g:18224:3: ruleXAnnotationElementValueOrCommaList
+            // InternalMenuDsl.g:18399:2: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalMenuDsl.g:18400:3: ruleXAnnotationElementValueOrCommaList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
@@ -59802,23 +60368,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ElementAssignment_0_0_0"
-    // InternalMenuDsl.g:18233:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
+    // InternalMenuDsl.g:18409:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
     public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18237:1: ( ( ( ruleValidID ) ) )
-            // InternalMenuDsl.g:18238:2: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:18413:1: ( ( ( ruleValidID ) ) )
+            // InternalMenuDsl.g:18414:2: ( ( ruleValidID ) )
             {
-            // InternalMenuDsl.g:18238:2: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:18239:3: ( ruleValidID )
+            // InternalMenuDsl.g:18414:2: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:18415:3: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
             }
-            // InternalMenuDsl.g:18240:3: ( ruleValidID )
-            // InternalMenuDsl.g:18241:4: ruleValidID
+            // InternalMenuDsl.g:18416:3: ( ruleValidID )
+            // InternalMenuDsl.g:18417:4: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationValidIDParserRuleCall_0_0_0_0_1()); 
@@ -59859,17 +60425,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ValueAssignment_1"
-    // InternalMenuDsl.g:18252:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
+    // InternalMenuDsl.g:18428:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
     public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18256:1: ( ( ruleXAnnotationElementValue ) )
-            // InternalMenuDsl.g:18257:2: ( ruleXAnnotationElementValue )
+            // InternalMenuDsl.g:18432:1: ( ( ruleXAnnotationElementValue ) )
+            // InternalMenuDsl.g:18433:2: ( ruleXAnnotationElementValue )
             {
-            // InternalMenuDsl.g:18257:2: ( ruleXAnnotationElementValue )
-            // InternalMenuDsl.g:18258:3: ruleXAnnotationElementValue
+            // InternalMenuDsl.g:18433:2: ( ruleXAnnotationElementValue )
+            // InternalMenuDsl.g:18434:3: ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
@@ -59904,17 +60470,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0"
-    // InternalMenuDsl.g:18267:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalMenuDsl.g:18443:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18271:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalMenuDsl.g:18272:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18447:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalMenuDsl.g:18448:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalMenuDsl.g:18272:2: ( ruleXAnnotationOrExpression )
-            // InternalMenuDsl.g:18273:3: ruleXAnnotationOrExpression
+            // InternalMenuDsl.g:18448:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18449:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
@@ -59949,17 +60515,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1"
-    // InternalMenuDsl.g:18282:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalMenuDsl.g:18458: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 {
-            // InternalMenuDsl.g:18286:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalMenuDsl.g:18287:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18462:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalMenuDsl.g:18463:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalMenuDsl.g:18287:2: ( ruleXAnnotationOrExpression )
-            // InternalMenuDsl.g:18288:3: ruleXAnnotationOrExpression
+            // InternalMenuDsl.g:18463:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18464:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
@@ -59994,17 +60560,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1"
-    // InternalMenuDsl.g:18297:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalMenuDsl.g:18473: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 {
-            // InternalMenuDsl.g:18301:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalMenuDsl.g:18302:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18477:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalMenuDsl.g:18478:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalMenuDsl.g:18302:2: ( ruleXAnnotationOrExpression )
-            // InternalMenuDsl.g:18303:3: ruleXAnnotationOrExpression
+            // InternalMenuDsl.g:18478:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18479:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
@@ -60039,17 +60605,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_0"
-    // InternalMenuDsl.g:18312:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalMenuDsl.g:18488:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18316:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalMenuDsl.g:18317:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18492:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalMenuDsl.g:18493:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalMenuDsl.g:18317:2: ( ruleXAnnotationOrExpression )
-            // InternalMenuDsl.g:18318:3: ruleXAnnotationOrExpression
+            // InternalMenuDsl.g:18493:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18494:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
@@ -60084,17 +60650,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1"
-    // InternalMenuDsl.g:18327:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalMenuDsl.g:18503: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 {
-            // InternalMenuDsl.g:18331:1: ( ( ruleXAnnotationOrExpression ) )
-            // InternalMenuDsl.g:18332:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18507:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalMenuDsl.g:18508:2: ( ruleXAnnotationOrExpression )
             {
-            // InternalMenuDsl.g:18332:2: ( ruleXAnnotationOrExpression )
-            // InternalMenuDsl.g:18333:3: ruleXAnnotationOrExpression
+            // InternalMenuDsl.g:18508:2: ( ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:18509:3: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
@@ -60129,23 +60695,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_0_1"
-    // InternalMenuDsl.g:18342:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
+    // InternalMenuDsl.g:18518:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18346:1: ( ( ( ruleFeatureCallID ) ) )
-            // InternalMenuDsl.g:18347:2: ( ( ruleFeatureCallID ) )
+            // InternalMenuDsl.g:18522:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalMenuDsl.g:18523:2: ( ( ruleFeatureCallID ) )
             {
-            // InternalMenuDsl.g:18347:2: ( ( ruleFeatureCallID ) )
-            // InternalMenuDsl.g:18348:3: ( ruleFeatureCallID )
+            // InternalMenuDsl.g:18523:2: ( ( ruleFeatureCallID ) )
+            // InternalMenuDsl.g:18524:3: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // InternalMenuDsl.g:18349:3: ( ruleFeatureCallID )
-            // InternalMenuDsl.g:18350:4: ruleFeatureCallID
+            // InternalMenuDsl.g:18525:3: ( ruleFeatureCallID )
+            // InternalMenuDsl.g:18526:4: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_0_1_0_1()); 
@@ -60186,17 +60752,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__ValueAssignment_0_3"
-    // InternalMenuDsl.g:18361:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
+    // InternalMenuDsl.g:18537:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18365:1: ( ( ruleXAssignment ) )
-            // InternalMenuDsl.g:18366:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:18541:1: ( ( ruleXAssignment ) )
+            // InternalMenuDsl.g:18542:2: ( ruleXAssignment )
             {
-            // InternalMenuDsl.g:18366:2: ( ruleXAssignment )
-            // InternalMenuDsl.g:18367:3: ruleXAssignment
+            // InternalMenuDsl.g:18542:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:18543:3: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
@@ -60231,23 +60797,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_1_1_0_0_1"
-    // InternalMenuDsl.g:18376:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
+    // InternalMenuDsl.g:18552: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 {
-            // InternalMenuDsl.g:18380:1: ( ( ( ruleOpMultiAssign ) ) )
-            // InternalMenuDsl.g:18381:2: ( ( ruleOpMultiAssign ) )
+            // InternalMenuDsl.g:18556:1: ( ( ( ruleOpMultiAssign ) ) )
+            // InternalMenuDsl.g:18557:2: ( ( ruleOpMultiAssign ) )
             {
-            // InternalMenuDsl.g:18381:2: ( ( ruleOpMultiAssign ) )
-            // InternalMenuDsl.g:18382:3: ( ruleOpMultiAssign )
+            // InternalMenuDsl.g:18557:2: ( ( ruleOpMultiAssign ) )
+            // InternalMenuDsl.g:18558:3: ( ruleOpMultiAssign )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18383:3: ( ruleOpMultiAssign )
-            // InternalMenuDsl.g:18384:4: ruleOpMultiAssign
+            // InternalMenuDsl.g:18559:3: ( ruleOpMultiAssign )
+            // InternalMenuDsl.g:18560:4: ruleOpMultiAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementOpMultiAssignParserRuleCall_1_1_0_0_1_0_1()); 
@@ -60288,17 +60854,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAssignment__RightOperandAssignment_1_1_1"
-    // InternalMenuDsl.g:18395:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
+    // InternalMenuDsl.g:18571:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18399:1: ( ( ruleXAssignment ) )
-            // InternalMenuDsl.g:18400:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:18575:1: ( ( ruleXAssignment ) )
+            // InternalMenuDsl.g:18576:2: ( ruleXAssignment )
             {
-            // InternalMenuDsl.g:18400:2: ( ruleXAssignment )
-            // InternalMenuDsl.g:18401:3: ruleXAssignment
+            // InternalMenuDsl.g:18576:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:18577:3: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
@@ -60333,23 +60899,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__FeatureAssignment_1_0_0_1"
-    // InternalMenuDsl.g:18410:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
+    // InternalMenuDsl.g:18586: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 {
-            // InternalMenuDsl.g:18414:1: ( ( ( ruleOpOr ) ) )
-            // InternalMenuDsl.g:18415:2: ( ( ruleOpOr ) )
+            // InternalMenuDsl.g:18590:1: ( ( ( ruleOpOr ) ) )
+            // InternalMenuDsl.g:18591:2: ( ( ruleOpOr ) )
             {
-            // InternalMenuDsl.g:18415:2: ( ( ruleOpOr ) )
-            // InternalMenuDsl.g:18416:3: ( ruleOpOr )
+            // InternalMenuDsl.g:18591:2: ( ( ruleOpOr ) )
+            // InternalMenuDsl.g:18592:3: ( ruleOpOr )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18417:3: ( ruleOpOr )
-            // InternalMenuDsl.g:18418:4: ruleOpOr
+            // InternalMenuDsl.g:18593:3: ( ruleOpOr )
+            // InternalMenuDsl.g:18594:4: ruleOpOr
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementOpOrParserRuleCall_1_0_0_1_0_1()); 
@@ -60390,17 +60956,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOrExpression__RightOperandAssignment_1_1"
-    // InternalMenuDsl.g:18429:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
+    // InternalMenuDsl.g:18605:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18433:1: ( ( ruleXAndExpression ) )
-            // InternalMenuDsl.g:18434:2: ( ruleXAndExpression )
+            // InternalMenuDsl.g:18609:1: ( ( ruleXAndExpression ) )
+            // InternalMenuDsl.g:18610:2: ( ruleXAndExpression )
             {
-            // InternalMenuDsl.g:18434:2: ( ruleXAndExpression )
-            // InternalMenuDsl.g:18435:3: ruleXAndExpression
+            // InternalMenuDsl.g:18610:2: ( ruleXAndExpression )
+            // InternalMenuDsl.g:18611:3: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
@@ -60435,23 +61001,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__FeatureAssignment_1_0_0_1"
-    // InternalMenuDsl.g:18444:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
+    // InternalMenuDsl.g:18620: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 {
-            // InternalMenuDsl.g:18448:1: ( ( ( ruleOpAnd ) ) )
-            // InternalMenuDsl.g:18449:2: ( ( ruleOpAnd ) )
+            // InternalMenuDsl.g:18624:1: ( ( ( ruleOpAnd ) ) )
+            // InternalMenuDsl.g:18625:2: ( ( ruleOpAnd ) )
             {
-            // InternalMenuDsl.g:18449:2: ( ( ruleOpAnd ) )
-            // InternalMenuDsl.g:18450:3: ( ruleOpAnd )
+            // InternalMenuDsl.g:18625:2: ( ( ruleOpAnd ) )
+            // InternalMenuDsl.g:18626:3: ( ruleOpAnd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18451:3: ( ruleOpAnd )
-            // InternalMenuDsl.g:18452:4: ruleOpAnd
+            // InternalMenuDsl.g:18627:3: ( ruleOpAnd )
+            // InternalMenuDsl.g:18628:4: ruleOpAnd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementOpAndParserRuleCall_1_0_0_1_0_1()); 
@@ -60492,17 +61058,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAndExpression__RightOperandAssignment_1_1"
-    // InternalMenuDsl.g:18463:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
+    // InternalMenuDsl.g:18639:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18467:1: ( ( ruleXEqualityExpression ) )
-            // InternalMenuDsl.g:18468:2: ( ruleXEqualityExpression )
+            // InternalMenuDsl.g:18643:1: ( ( ruleXEqualityExpression ) )
+            // InternalMenuDsl.g:18644:2: ( ruleXEqualityExpression )
             {
-            // InternalMenuDsl.g:18468:2: ( ruleXEqualityExpression )
-            // InternalMenuDsl.g:18469:3: ruleXEqualityExpression
+            // InternalMenuDsl.g:18644:2: ( ruleXEqualityExpression )
+            // InternalMenuDsl.g:18645:3: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
@@ -60537,23 +61103,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__FeatureAssignment_1_0_0_1"
-    // InternalMenuDsl.g:18478:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
+    // InternalMenuDsl.g:18654: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 {
-            // InternalMenuDsl.g:18482:1: ( ( ( ruleOpEquality ) ) )
-            // InternalMenuDsl.g:18483:2: ( ( ruleOpEquality ) )
+            // InternalMenuDsl.g:18658:1: ( ( ( ruleOpEquality ) ) )
+            // InternalMenuDsl.g:18659:2: ( ( ruleOpEquality ) )
             {
-            // InternalMenuDsl.g:18483:2: ( ( ruleOpEquality ) )
-            // InternalMenuDsl.g:18484:3: ( ruleOpEquality )
+            // InternalMenuDsl.g:18659:2: ( ( ruleOpEquality ) )
+            // InternalMenuDsl.g:18660:3: ( ruleOpEquality )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18485:3: ( ruleOpEquality )
-            // InternalMenuDsl.g:18486:4: ruleOpEquality
+            // InternalMenuDsl.g:18661:3: ( ruleOpEquality )
+            // InternalMenuDsl.g:18662:4: ruleOpEquality
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementOpEqualityParserRuleCall_1_0_0_1_0_1()); 
@@ -60594,17 +61160,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XEqualityExpression__RightOperandAssignment_1_1"
-    // InternalMenuDsl.g:18497:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
+    // InternalMenuDsl.g:18673:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18501:1: ( ( ruleXRelationalExpression ) )
-            // InternalMenuDsl.g:18502:2: ( ruleXRelationalExpression )
+            // InternalMenuDsl.g:18677:1: ( ( ruleXRelationalExpression ) )
+            // InternalMenuDsl.g:18678:2: ( ruleXRelationalExpression )
             {
-            // InternalMenuDsl.g:18502:2: ( ruleXRelationalExpression )
-            // InternalMenuDsl.g:18503:3: ruleXRelationalExpression
+            // InternalMenuDsl.g:18678:2: ( ruleXRelationalExpression )
+            // InternalMenuDsl.g:18679:3: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
@@ -60639,17 +61205,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__TypeAssignment_1_0_1"
-    // InternalMenuDsl.g:18512:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:18688:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18516:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:18517:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:18692:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:18693:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:18517:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:18518:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:18693:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:18694:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
@@ -60684,23 +61250,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1"
-    // InternalMenuDsl.g:18527:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
+    // InternalMenuDsl.g:18703: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 {
-            // InternalMenuDsl.g:18531:1: ( ( ( ruleOpCompare ) ) )
-            // InternalMenuDsl.g:18532:2: ( ( ruleOpCompare ) )
+            // InternalMenuDsl.g:18707:1: ( ( ( ruleOpCompare ) ) )
+            // InternalMenuDsl.g:18708:2: ( ( ruleOpCompare ) )
             {
-            // InternalMenuDsl.g:18532:2: ( ( ruleOpCompare ) )
-            // InternalMenuDsl.g:18533:3: ( ruleOpCompare )
+            // InternalMenuDsl.g:18708:2: ( ( ruleOpCompare ) )
+            // InternalMenuDsl.g:18709:3: ( ruleOpCompare )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18534:3: ( ruleOpCompare )
-            // InternalMenuDsl.g:18535:4: ruleOpCompare
+            // InternalMenuDsl.g:18710:3: ( ruleOpCompare )
+            // InternalMenuDsl.g:18711:4: ruleOpCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementOpCompareParserRuleCall_1_1_0_0_1_0_1()); 
@@ -60741,17 +61307,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XRelationalExpression__RightOperandAssignment_1_1_1"
-    // InternalMenuDsl.g:18546:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
+    // InternalMenuDsl.g:18722:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18550:1: ( ( ruleXOtherOperatorExpression ) )
-            // InternalMenuDsl.g:18551:2: ( ruleXOtherOperatorExpression )
+            // InternalMenuDsl.g:18726:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalMenuDsl.g:18727:2: ( ruleXOtherOperatorExpression )
             {
-            // InternalMenuDsl.g:18551:2: ( ruleXOtherOperatorExpression )
-            // InternalMenuDsl.g:18552:3: ruleXOtherOperatorExpression
+            // InternalMenuDsl.g:18727:2: ( ruleXOtherOperatorExpression )
+            // InternalMenuDsl.g:18728:3: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
@@ -60786,23 +61352,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1"
-    // InternalMenuDsl.g:18561:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
+    // InternalMenuDsl.g:18737: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 {
-            // InternalMenuDsl.g:18565:1: ( ( ( ruleOpOther ) ) )
-            // InternalMenuDsl.g:18566:2: ( ( ruleOpOther ) )
+            // InternalMenuDsl.g:18741:1: ( ( ( ruleOpOther ) ) )
+            // InternalMenuDsl.g:18742:2: ( ( ruleOpOther ) )
             {
-            // InternalMenuDsl.g:18566:2: ( ( ruleOpOther ) )
-            // InternalMenuDsl.g:18567:3: ( ruleOpOther )
+            // InternalMenuDsl.g:18742:2: ( ( ruleOpOther ) )
+            // InternalMenuDsl.g:18743:3: ( ruleOpOther )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18568:3: ( ruleOpOther )
-            // InternalMenuDsl.g:18569:4: ruleOpOther
+            // InternalMenuDsl.g:18744:3: ( ruleOpOther )
+            // InternalMenuDsl.g:18745:4: ruleOpOther
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementOpOtherParserRuleCall_1_0_0_1_0_1()); 
@@ -60843,17 +61409,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__RightOperandAssignment_1_1"
-    // InternalMenuDsl.g:18580:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
+    // InternalMenuDsl.g:18756:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18584:1: ( ( ruleXAdditiveExpression ) )
-            // InternalMenuDsl.g:18585:2: ( ruleXAdditiveExpression )
+            // InternalMenuDsl.g:18760:1: ( ( ruleXAdditiveExpression ) )
+            // InternalMenuDsl.g:18761:2: ( ruleXAdditiveExpression )
             {
-            // InternalMenuDsl.g:18585:2: ( ruleXAdditiveExpression )
-            // InternalMenuDsl.g:18586:3: ruleXAdditiveExpression
+            // InternalMenuDsl.g:18761:2: ( ruleXAdditiveExpression )
+            // InternalMenuDsl.g:18762:3: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
@@ -60888,23 +61454,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__FeatureAssignment_1_0_0_1"
-    // InternalMenuDsl.g:18595:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
+    // InternalMenuDsl.g:18771: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 {
-            // InternalMenuDsl.g:18599:1: ( ( ( ruleOpAdd ) ) )
-            // InternalMenuDsl.g:18600:2: ( ( ruleOpAdd ) )
+            // InternalMenuDsl.g:18775:1: ( ( ( ruleOpAdd ) ) )
+            // InternalMenuDsl.g:18776:2: ( ( ruleOpAdd ) )
             {
-            // InternalMenuDsl.g:18600:2: ( ( ruleOpAdd ) )
-            // InternalMenuDsl.g:18601:3: ( ruleOpAdd )
+            // InternalMenuDsl.g:18776:2: ( ( ruleOpAdd ) )
+            // InternalMenuDsl.g:18777:3: ( ruleOpAdd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18602:3: ( ruleOpAdd )
-            // InternalMenuDsl.g:18603:4: ruleOpAdd
+            // InternalMenuDsl.g:18778:3: ( ruleOpAdd )
+            // InternalMenuDsl.g:18779:4: ruleOpAdd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementOpAddParserRuleCall_1_0_0_1_0_1()); 
@@ -60945,17 +61511,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XAdditiveExpression__RightOperandAssignment_1_1"
-    // InternalMenuDsl.g:18614:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
+    // InternalMenuDsl.g:18790:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18618:1: ( ( ruleXMultiplicativeExpression ) )
-            // InternalMenuDsl.g:18619:2: ( ruleXMultiplicativeExpression )
+            // InternalMenuDsl.g:18794:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalMenuDsl.g:18795:2: ( ruleXMultiplicativeExpression )
             {
-            // InternalMenuDsl.g:18619:2: ( ruleXMultiplicativeExpression )
-            // InternalMenuDsl.g:18620:3: ruleXMultiplicativeExpression
+            // InternalMenuDsl.g:18795:2: ( ruleXMultiplicativeExpression )
+            // InternalMenuDsl.g:18796:3: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
@@ -60990,23 +61556,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1"
-    // InternalMenuDsl.g:18629:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
+    // InternalMenuDsl.g:18805: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 {
-            // InternalMenuDsl.g:18633:1: ( ( ( ruleOpMulti ) ) )
-            // InternalMenuDsl.g:18634:2: ( ( ruleOpMulti ) )
+            // InternalMenuDsl.g:18809:1: ( ( ( ruleOpMulti ) ) )
+            // InternalMenuDsl.g:18810:2: ( ( ruleOpMulti ) )
             {
-            // InternalMenuDsl.g:18634:2: ( ( ruleOpMulti ) )
-            // InternalMenuDsl.g:18635:3: ( ruleOpMulti )
+            // InternalMenuDsl.g:18810:2: ( ( ruleOpMulti ) )
+            // InternalMenuDsl.g:18811:3: ( ruleOpMulti )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // InternalMenuDsl.g:18636:3: ( ruleOpMulti )
-            // InternalMenuDsl.g:18637:4: ruleOpMulti
+            // InternalMenuDsl.g:18812:3: ( ruleOpMulti )
+            // InternalMenuDsl.g:18813:4: ruleOpMulti
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementOpMultiParserRuleCall_1_0_0_1_0_1()); 
@@ -61047,17 +61613,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__RightOperandAssignment_1_1"
-    // InternalMenuDsl.g:18648:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
+    // InternalMenuDsl.g:18824:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18652:1: ( ( ruleXUnaryOperation ) )
-            // InternalMenuDsl.g:18653:2: ( ruleXUnaryOperation )
+            // InternalMenuDsl.g:18828:1: ( ( ruleXUnaryOperation ) )
+            // InternalMenuDsl.g:18829:2: ( ruleXUnaryOperation )
             {
-            // InternalMenuDsl.g:18653:2: ( ruleXUnaryOperation )
-            // InternalMenuDsl.g:18654:3: ruleXUnaryOperation
+            // InternalMenuDsl.g:18829:2: ( ruleXUnaryOperation )
+            // InternalMenuDsl.g:18830:3: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
@@ -61092,23 +61658,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__FeatureAssignment_0_1"
-    // InternalMenuDsl.g:18663:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // InternalMenuDsl.g:18839:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18667:1: ( ( ( ruleOpUnary ) ) )
-            // InternalMenuDsl.g:18668:2: ( ( ruleOpUnary ) )
+            // InternalMenuDsl.g:18843:1: ( ( ( ruleOpUnary ) ) )
+            // InternalMenuDsl.g:18844:2: ( ( ruleOpUnary ) )
             {
-            // InternalMenuDsl.g:18668:2: ( ( ruleOpUnary ) )
-            // InternalMenuDsl.g:18669:3: ( ruleOpUnary )
+            // InternalMenuDsl.g:18844:2: ( ( ruleOpUnary ) )
+            // InternalMenuDsl.g:18845:3: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // InternalMenuDsl.g:18670:3: ( ruleOpUnary )
-            // InternalMenuDsl.g:18671:4: ruleOpUnary
+            // InternalMenuDsl.g:18846:3: ( ruleOpUnary )
+            // InternalMenuDsl.g:18847:4: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
@@ -61149,17 +61715,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XUnaryOperation__OperandAssignment_0_2"
-    // InternalMenuDsl.g:18682:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
+    // InternalMenuDsl.g:18858:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
     public final void rule__XUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18686:1: ( ( ruleXUnaryOperation ) )
-            // InternalMenuDsl.g:18687:2: ( ruleXUnaryOperation )
+            // InternalMenuDsl.g:18862:1: ( ( ruleXUnaryOperation ) )
+            // InternalMenuDsl.g:18863:2: ( ruleXUnaryOperation )
             {
-            // InternalMenuDsl.g:18687:2: ( ruleXUnaryOperation )
-            // InternalMenuDsl.g:18688:3: ruleXUnaryOperation
+            // InternalMenuDsl.g:18863:2: ( ruleXUnaryOperation )
+            // InternalMenuDsl.g:18864:3: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
@@ -61194,17 +61760,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCastedExpression__TypeAssignment_1_1"
-    // InternalMenuDsl.g:18697:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:18873:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCastedExpression__TypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18701:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:18702:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:18877:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:18878:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:18702:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:18703:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:18878:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:18879:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
@@ -61239,23 +61805,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XPostfixOperation__FeatureAssignment_1_0_1"
-    // InternalMenuDsl.g:18712:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
+    // InternalMenuDsl.g:18888:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
     public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18716:1: ( ( ( ruleOpPostfix ) ) )
-            // InternalMenuDsl.g:18717:2: ( ( ruleOpPostfix ) )
+            // InternalMenuDsl.g:18892:1: ( ( ( ruleOpPostfix ) ) )
+            // InternalMenuDsl.g:18893:2: ( ( ruleOpPostfix ) )
             {
-            // InternalMenuDsl.g:18717:2: ( ( ruleOpPostfix ) )
-            // InternalMenuDsl.g:18718:3: ( ruleOpPostfix )
+            // InternalMenuDsl.g:18893:2: ( ( ruleOpPostfix ) )
+            // InternalMenuDsl.g:18894:3: ( ruleOpPostfix )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
             }
-            // InternalMenuDsl.g:18719:3: ( ruleOpPostfix )
-            // InternalMenuDsl.g:18720:4: ruleOpPostfix
+            // InternalMenuDsl.g:18895:3: ( ruleOpPostfix )
+            // InternalMenuDsl.g:18896:4: ruleOpPostfix
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementOpPostfixParserRuleCall_1_0_1_0_1()); 
@@ -61296,28 +61862,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1"
-    // InternalMenuDsl.g:18731:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
+    // InternalMenuDsl.g:18907: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 {
-            // InternalMenuDsl.g:18735:1: ( ( ( '::' ) ) )
-            // InternalMenuDsl.g:18736:2: ( ( '::' ) )
+            // InternalMenuDsl.g:18911:1: ( ( ( '::' ) ) )
+            // InternalMenuDsl.g:18912:2: ( ( '::' ) )
             {
-            // InternalMenuDsl.g:18736:2: ( ( '::' ) )
-            // InternalMenuDsl.g:18737:3: ( '::' )
+            // InternalMenuDsl.g:18912:2: ( ( '::' ) )
+            // InternalMenuDsl.g:18913:3: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            // InternalMenuDsl.g:18738:3: ( '::' )
-            // InternalMenuDsl.g:18739:4: '::'
+            // InternalMenuDsl.g:18914:3: ( '::' )
+            // InternalMenuDsl.g:18915:4: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            match(input,101,FOLLOW_2); if (state.failed) return ;
+            match(input,103,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
@@ -61349,23 +61915,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2"
-    // InternalMenuDsl.g:18750:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
+    // InternalMenuDsl.g:18926: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 {
-            // InternalMenuDsl.g:18754:1: ( ( ( ruleFeatureCallID ) ) )
-            // InternalMenuDsl.g:18755:2: ( ( ruleFeatureCallID ) )
+            // InternalMenuDsl.g:18930:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalMenuDsl.g:18931:2: ( ( ruleFeatureCallID ) )
             {
-            // InternalMenuDsl.g:18755:2: ( ( ruleFeatureCallID ) )
-            // InternalMenuDsl.g:18756:3: ( ruleFeatureCallID )
+            // InternalMenuDsl.g:18931:2: ( ( ruleFeatureCallID ) )
+            // InternalMenuDsl.g:18932:3: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             }
-            // InternalMenuDsl.g:18757:3: ( ruleFeatureCallID )
-            // InternalMenuDsl.g:18758:4: ruleFeatureCallID
+            // InternalMenuDsl.g:18933:3: ( ruleFeatureCallID )
+            // InternalMenuDsl.g:18934:4: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_1_0_0_0_2_0_1()); 
@@ -61406,17 +61972,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ValueAssignment_1_0_1"
-    // InternalMenuDsl.g:18769:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
+    // InternalMenuDsl.g:18945:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
     public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18773:1: ( ( ruleXAssignment ) )
-            // InternalMenuDsl.g:18774:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:18949:1: ( ( ruleXAssignment ) )
+            // InternalMenuDsl.g:18950:2: ( ruleXAssignment )
             {
-            // InternalMenuDsl.g:18774:2: ( ruleXAssignment )
-            // InternalMenuDsl.g:18775:3: ruleXAssignment
+            // InternalMenuDsl.g:18950:2: ( ruleXAssignment )
+            // InternalMenuDsl.g:18951:3: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
@@ -61451,28 +62017,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1"
-    // InternalMenuDsl.g:18784:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
+    // InternalMenuDsl.g:18960: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 {
-            // InternalMenuDsl.g:18788:1: ( ( ( '?.' ) ) )
-            // InternalMenuDsl.g:18789:2: ( ( '?.' ) )
+            // InternalMenuDsl.g:18964:1: ( ( ( '?.' ) ) )
+            // InternalMenuDsl.g:18965:2: ( ( '?.' ) )
             {
-            // InternalMenuDsl.g:18789:2: ( ( '?.' ) )
-            // InternalMenuDsl.g:18790:3: ( '?.' )
+            // InternalMenuDsl.g:18965:2: ( ( '?.' ) )
+            // InternalMenuDsl.g:18966:3: ( '?.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            // InternalMenuDsl.g:18791:3: ( '?.' )
-            // InternalMenuDsl.g:18792:4: '?.'
+            // InternalMenuDsl.g:18967:3: ( '?.' )
+            // InternalMenuDsl.g:18968:4: '?.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            match(input,102,FOLLOW_2); if (state.failed) return ;
+            match(input,104,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
@@ -61504,28 +62070,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2"
-    // InternalMenuDsl.g:18803:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
+    // InternalMenuDsl.g:18979: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 {
-            // InternalMenuDsl.g:18807:1: ( ( ( '::' ) ) )
-            // InternalMenuDsl.g:18808:2: ( ( '::' ) )
+            // InternalMenuDsl.g:18983:1: ( ( ( '::' ) ) )
+            // InternalMenuDsl.g:18984:2: ( ( '::' ) )
             {
-            // InternalMenuDsl.g:18808:2: ( ( '::' ) )
-            // InternalMenuDsl.g:18809:3: ( '::' )
+            // InternalMenuDsl.g:18984:2: ( ( '::' ) )
+            // InternalMenuDsl.g:18985:3: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            // InternalMenuDsl.g:18810:3: ( '::' )
-            // InternalMenuDsl.g:18811:4: '::'
+            // InternalMenuDsl.g:18986:3: ( '::' )
+            // InternalMenuDsl.g:18987:4: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            match(input,101,FOLLOW_2); if (state.failed) return ;
+            match(input,103,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
@@ -61557,17 +62123,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1"
-    // InternalMenuDsl.g:18822:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:18998: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 {
-            // InternalMenuDsl.g:18826:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:18827:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19002:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:19003:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:18827:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:18828:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:19003:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19004:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
@@ -61602,17 +62168,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1"
-    // InternalMenuDsl.g:18837:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:19013: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 {
-            // InternalMenuDsl.g:18841:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:18842:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19017:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:19018:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:18842:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:18843:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:19018:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19019:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
@@ -61647,23 +62213,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_1_2"
-    // InternalMenuDsl.g:18852:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalMenuDsl.g:19028:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18856:1: ( ( ( ruleIdOrSuper ) ) )
-            // InternalMenuDsl.g:18857:2: ( ( ruleIdOrSuper ) )
+            // InternalMenuDsl.g:19032:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalMenuDsl.g:19033:2: ( ( ruleIdOrSuper ) )
             {
-            // InternalMenuDsl.g:18857:2: ( ( ruleIdOrSuper ) )
-            // InternalMenuDsl.g:18858:3: ( ruleIdOrSuper )
+            // InternalMenuDsl.g:19033:2: ( ( ruleIdOrSuper ) )
+            // InternalMenuDsl.g:19034:3: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             }
-            // InternalMenuDsl.g:18859:3: ( ruleIdOrSuper )
-            // InternalMenuDsl.g:18860:4: ruleIdOrSuper
+            // InternalMenuDsl.g:19035:3: ( ruleIdOrSuper )
+            // InternalMenuDsl.g:19036:4: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_1_1_2_0_1()); 
@@ -61704,28 +62270,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0"
-    // InternalMenuDsl.g:18871:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
+    // InternalMenuDsl.g:19047:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18875:1: ( ( ( '(' ) ) )
-            // InternalMenuDsl.g:18876:2: ( ( '(' ) )
+            // InternalMenuDsl.g:19051:1: ( ( ( '(' ) ) )
+            // InternalMenuDsl.g:19052:2: ( ( '(' ) )
             {
-            // InternalMenuDsl.g:18876:2: ( ( '(' ) )
-            // InternalMenuDsl.g:18877:3: ( '(' )
+            // InternalMenuDsl.g:19052:2: ( ( '(' ) )
+            // InternalMenuDsl.g:19053:3: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            // InternalMenuDsl.g:18878:3: ( '(' )
-            // InternalMenuDsl.g:18879:4: '('
+            // InternalMenuDsl.g:19054:3: ( '(' )
+            // InternalMenuDsl.g:19055:4: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
@@ -61757,17 +62323,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0"
-    // InternalMenuDsl.g:18890:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalMenuDsl.g:19066: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 {
-            // InternalMenuDsl.g:18894:1: ( ( ruleXShortClosure ) )
-            // InternalMenuDsl.g:18895:2: ( ruleXShortClosure )
+            // InternalMenuDsl.g:19070:1: ( ( ruleXShortClosure ) )
+            // InternalMenuDsl.g:19071:2: ( ruleXShortClosure )
             {
-            // InternalMenuDsl.g:18895:2: ( ruleXShortClosure )
-            // InternalMenuDsl.g:18896:3: ruleXShortClosure
+            // InternalMenuDsl.g:19071:2: ( ruleXShortClosure )
+            // InternalMenuDsl.g:19072:3: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
@@ -61802,17 +62368,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0"
-    // InternalMenuDsl.g:18905:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19081: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 {
-            // InternalMenuDsl.g:18909:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:18910:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19085:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19086:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:18910:2: ( ruleXExpression )
-            // InternalMenuDsl.g:18911:3: ruleXExpression
+            // InternalMenuDsl.g:19086:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19087:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
@@ -61847,17 +62413,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1"
-    // InternalMenuDsl.g:18920:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19096: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 {
-            // InternalMenuDsl.g:18924:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:18925:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19100:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19101:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:18925:2: ( ruleXExpression )
-            // InternalMenuDsl.g:18926:3: ruleXExpression
+            // InternalMenuDsl.g:19101:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19102:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
@@ -61892,17 +62458,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4"
-    // InternalMenuDsl.g:18935:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
+    // InternalMenuDsl.g:19111:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18939:1: ( ( ruleXClosure ) )
-            // InternalMenuDsl.g:18940:2: ( ruleXClosure )
+            // InternalMenuDsl.g:19115:1: ( ( ruleXClosure ) )
+            // InternalMenuDsl.g:19116:2: ( ruleXClosure )
             {
-            // InternalMenuDsl.g:18940:2: ( ruleXClosure )
-            // InternalMenuDsl.g:18941:3: ruleXClosure
+            // InternalMenuDsl.g:19116:2: ( ruleXClosure )
+            // InternalMenuDsl.g:19117:3: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
@@ -61937,17 +62503,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_0"
-    // InternalMenuDsl.g:18950:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19126:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18954:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:18955:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19130:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19131:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:18955:2: ( ruleXExpression )
-            // InternalMenuDsl.g:18956:3: ruleXExpression
+            // InternalMenuDsl.g:19131:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19132:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
@@ -61982,17 +62548,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_1_1"
-    // InternalMenuDsl.g:18965:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19141:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18969:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:18970:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19145:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19146:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:18970:2: ( ruleXExpression )
-            // InternalMenuDsl.g:18971:3: ruleXExpression
+            // InternalMenuDsl.g:19146:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19147:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
@@ -62027,17 +62593,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_0"
-    // InternalMenuDsl.g:18980:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19156:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18984:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:18985:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19160:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19161:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:18985:2: ( ruleXExpression )
-            // InternalMenuDsl.g:18986:3: ruleXExpression
+            // InternalMenuDsl.g:19161:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19162:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
@@ -62072,17 +62638,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_1_1"
-    // InternalMenuDsl.g:18995:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19171:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:18999:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19000:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19175:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19176:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19000:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19001:3: ruleXExpression
+            // InternalMenuDsl.g:19176:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19177:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
@@ -62117,17 +62683,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0"
-    // InternalMenuDsl.g:19010:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalMenuDsl.g:19186: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 {
-            // InternalMenuDsl.g:19014:1: ( ( ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:19015:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19190:1: ( ( ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:19191:2: ( ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:19015:2: ( ruleJvmFormalParameter )
-            // InternalMenuDsl.g:19016:3: ruleJvmFormalParameter
+            // InternalMenuDsl.g:19191:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19192:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
@@ -62162,17 +62728,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1"
-    // InternalMenuDsl.g:19025:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalMenuDsl.g:19201: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 {
-            // InternalMenuDsl.g:19029:1: ( ( ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:19030:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19205:1: ( ( ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:19206:2: ( ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:19030:2: ( ruleJvmFormalParameter )
-            // InternalMenuDsl.g:19031:3: ruleJvmFormalParameter
+            // InternalMenuDsl.g:19206:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19207:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
@@ -62207,28 +62773,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__ExplicitSyntaxAssignment_1_0_1"
-    // InternalMenuDsl.g:19040:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
+    // InternalMenuDsl.g:19216:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
     public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19044:1: ( ( ( '|' ) ) )
-            // InternalMenuDsl.g:19045:2: ( ( '|' ) )
+            // InternalMenuDsl.g:19220:1: ( ( ( '|' ) ) )
+            // InternalMenuDsl.g:19221:2: ( ( '|' ) )
             {
-            // InternalMenuDsl.g:19045:2: ( ( '|' ) )
-            // InternalMenuDsl.g:19046:3: ( '|' )
+            // InternalMenuDsl.g:19221:2: ( ( '|' ) )
+            // InternalMenuDsl.g:19222:3: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            // InternalMenuDsl.g:19047:3: ( '|' )
-            // InternalMenuDsl.g:19048:4: '|'
+            // InternalMenuDsl.g:19223:3: ( '|' )
+            // InternalMenuDsl.g:19224:4: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            match(input,103,FOLLOW_2); if (state.failed) return ;
+            match(input,105,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
@@ -62260,17 +62826,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XClosure__ExpressionAssignment_2"
-    // InternalMenuDsl.g:19059:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
+    // InternalMenuDsl.g:19235:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
     public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19063:1: ( ( ruleXExpressionInClosure ) )
-            // InternalMenuDsl.g:19064:2: ( ruleXExpressionInClosure )
+            // InternalMenuDsl.g:19239:1: ( ( ruleXExpressionInClosure ) )
+            // InternalMenuDsl.g:19240:2: ( ruleXExpressionInClosure )
             {
-            // InternalMenuDsl.g:19064:2: ( ruleXExpressionInClosure )
-            // InternalMenuDsl.g:19065:3: ruleXExpressionInClosure
+            // InternalMenuDsl.g:19240:2: ( ruleXExpressionInClosure )
+            // InternalMenuDsl.g:19241:3: ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
@@ -62305,17 +62871,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XExpressionInClosure__ExpressionsAssignment_1_0"
-    // InternalMenuDsl.g:19074:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalMenuDsl.g:19250:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19078:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalMenuDsl.g:19079:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19254:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalMenuDsl.g:19255:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalMenuDsl.g:19079:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalMenuDsl.g:19080:3: ruleXExpressionOrVarDeclaration
+            // InternalMenuDsl.g:19255:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19256:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
@@ -62350,17 +62916,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0"
-    // InternalMenuDsl.g:19089:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
+    // InternalMenuDsl.g:19265: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 {
-            // InternalMenuDsl.g:19093:1: ( ( ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:19094:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19269:1: ( ( ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:19270:2: ( ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:19094:2: ( ruleJvmFormalParameter )
-            // InternalMenuDsl.g:19095:3: ruleJvmFormalParameter
+            // InternalMenuDsl.g:19270:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19271:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
@@ -62395,17 +62961,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1"
-    // InternalMenuDsl.g:19104:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalMenuDsl.g:19280: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 {
-            // InternalMenuDsl.g:19108:1: ( ( ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:19109:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19284:1: ( ( ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:19285:2: ( ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:19109:2: ( ruleJvmFormalParameter )
-            // InternalMenuDsl.g:19110:3: ruleJvmFormalParameter
+            // InternalMenuDsl.g:19285:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19286:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
@@ -62440,28 +63006,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2"
-    // InternalMenuDsl.g:19119:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
+    // InternalMenuDsl.g:19295:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
     public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19123:1: ( ( ( '|' ) ) )
-            // InternalMenuDsl.g:19124:2: ( ( '|' ) )
+            // InternalMenuDsl.g:19299:1: ( ( ( '|' ) ) )
+            // InternalMenuDsl.g:19300:2: ( ( '|' ) )
             {
-            // InternalMenuDsl.g:19124:2: ( ( '|' ) )
-            // InternalMenuDsl.g:19125:3: ( '|' )
+            // InternalMenuDsl.g:19300:2: ( ( '|' ) )
+            // InternalMenuDsl.g:19301:3: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            // InternalMenuDsl.g:19126:3: ( '|' )
-            // InternalMenuDsl.g:19127:4: '|'
+            // InternalMenuDsl.g:19302:3: ( '|' )
+            // InternalMenuDsl.g:19303:4: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            match(input,103,FOLLOW_2); if (state.failed) return ;
+            match(input,105,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
@@ -62493,17 +63059,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XShortClosure__ExpressionAssignment_1"
-    // InternalMenuDsl.g:19138:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19314:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XShortClosure__ExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19142:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19143:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19318:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19319:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19143:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19144:3: ruleXExpression
+            // InternalMenuDsl.g:19319:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19320:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
@@ -62538,17 +63104,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__IfAssignment_3"
-    // InternalMenuDsl.g:19153:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19329:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__IfAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19157:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19158:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19333:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19334:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19158:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19159:3: ruleXExpression
+            // InternalMenuDsl.g:19334:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19335:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
@@ -62583,17 +63149,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__ThenAssignment_5"
-    // InternalMenuDsl.g:19168:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19344:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19172:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19173:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19348:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19349:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19173:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19174:3: ruleXExpression
+            // InternalMenuDsl.g:19349:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19350:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
@@ -62628,17 +63194,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XIfExpression__ElseAssignment_6_1"
-    // InternalMenuDsl.g:19183:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19359:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19187:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19188:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19363:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19364:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19188:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19189:3: ruleXExpression
+            // InternalMenuDsl.g:19364:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19365:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
@@ -62673,17 +63239,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1"
-    // InternalMenuDsl.g:19198:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
+    // InternalMenuDsl.g:19374: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 {
-            // InternalMenuDsl.g:19202:1: ( ( ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:19203:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19378:1: ( ( ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:19379:2: ( ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:19203:2: ( ruleJvmFormalParameter )
-            // InternalMenuDsl.g:19204:3: ruleJvmFormalParameter
+            // InternalMenuDsl.g:19379:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19380:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
@@ -62718,17 +63284,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_0_1"
-    // InternalMenuDsl.g:19213:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19389:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19217:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19218:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19393:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19394:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19218:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19219:3: ruleXExpression
+            // InternalMenuDsl.g:19394:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19395:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
@@ -62763,17 +63329,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0"
-    // InternalMenuDsl.g:19228:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalMenuDsl.g:19404: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 {
-            // InternalMenuDsl.g:19232:1: ( ( ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:19233:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19408:1: ( ( ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:19409:2: ( ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:19233:2: ( ruleJvmFormalParameter )
-            // InternalMenuDsl.g:19234:3: ruleJvmFormalParameter
+            // InternalMenuDsl.g:19409:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19410:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
@@ -62808,17 +63374,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_1_1"
-    // InternalMenuDsl.g:19243:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19419:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19247:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19248:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19423:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19424:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19248:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19249:3: ruleXExpression
+            // InternalMenuDsl.g:19424:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19425:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
@@ -62853,17 +63419,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__CasesAssignment_4"
-    // InternalMenuDsl.g:19258:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
+    // InternalMenuDsl.g:19434:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
     public final void rule__XSwitchExpression__CasesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19262:1: ( ( ruleXCasePart ) )
-            // InternalMenuDsl.g:19263:2: ( ruleXCasePart )
+            // InternalMenuDsl.g:19438:1: ( ( ruleXCasePart ) )
+            // InternalMenuDsl.g:19439:2: ( ruleXCasePart )
             {
-            // InternalMenuDsl.g:19263:2: ( ruleXCasePart )
-            // InternalMenuDsl.g:19264:3: ruleXCasePart
+            // InternalMenuDsl.g:19439:2: ( ruleXCasePart )
+            // InternalMenuDsl.g:19440:3: ruleXCasePart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
@@ -62898,17 +63464,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSwitchExpression__DefaultAssignment_5_2"
-    // InternalMenuDsl.g:19273:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19449:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19277:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19278:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19453:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19454:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19278:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19279:3: ruleXExpression
+            // InternalMenuDsl.g:19454:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19455:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
@@ -62943,17 +63509,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__TypeGuardAssignment_1"
-    // InternalMenuDsl.g:19288:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:19464:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19292:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:19293:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19468:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:19469:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:19293:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:19294:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:19469:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19470:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
@@ -62988,17 +63554,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__CaseAssignment_2_1"
-    // InternalMenuDsl.g:19303:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19479:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19307:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19308:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19483:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19484:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19308:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19309:3: ruleXExpression
+            // InternalMenuDsl.g:19484:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19485:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
@@ -63033,17 +63599,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__ThenAssignment_3_0_1"
-    // InternalMenuDsl.g:19318:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19494:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19322:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19323:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19498:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19499:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19323:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19324:3: ruleXExpression
+            // InternalMenuDsl.g:19499:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19500:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
@@ -63078,28 +63644,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCasePart__FallThroughAssignment_3_1"
-    // InternalMenuDsl.g:19333:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
+    // InternalMenuDsl.g:19509:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
     public final void rule__XCasePart__FallThroughAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19337:1: ( ( ( ',' ) ) )
-            // InternalMenuDsl.g:19338:2: ( ( ',' ) )
+            // InternalMenuDsl.g:19513:1: ( ( ( ',' ) ) )
+            // InternalMenuDsl.g:19514:2: ( ( ',' ) )
             {
-            // InternalMenuDsl.g:19338:2: ( ( ',' ) )
-            // InternalMenuDsl.g:19339:3: ( ',' )
+            // InternalMenuDsl.g:19514:2: ( ( ',' ) )
+            // InternalMenuDsl.g:19515:3: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            // InternalMenuDsl.g:19340:3: ( ',' )
-            // InternalMenuDsl.g:19341:4: ','
+            // InternalMenuDsl.g:19516:3: ( ',' )
+            // InternalMenuDsl.g:19517:4: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            match(input,63,FOLLOW_2); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
@@ -63131,17 +63697,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__DeclaredParamAssignment_0_0_3"
-    // InternalMenuDsl.g:19352:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
+    // InternalMenuDsl.g:19528:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
     public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19356:1: ( ( ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:19357:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19532:1: ( ( ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:19533:2: ( ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:19357:2: ( ruleJvmFormalParameter )
-            // InternalMenuDsl.g:19358:3: ruleJvmFormalParameter
+            // InternalMenuDsl.g:19533:2: ( ruleJvmFormalParameter )
+            // InternalMenuDsl.g:19534:3: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
@@ -63176,17 +63742,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__ForExpressionAssignment_1"
-    // InternalMenuDsl.g:19367:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19543:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19371:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19372:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19547:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19548:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19372:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19373:3: ruleXExpression
+            // InternalMenuDsl.g:19548:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19549:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
@@ -63221,17 +63787,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XForLoopExpression__EachExpressionAssignment_3"
-    // InternalMenuDsl.g:19382:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19558:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19386:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19387:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19562:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19563:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19387:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19388:3: ruleXExpression
+            // InternalMenuDsl.g:19563:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19564:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
@@ -63266,17 +63832,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0"
-    // InternalMenuDsl.g:19397:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalMenuDsl.g:19573:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19401:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalMenuDsl.g:19402:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19577:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalMenuDsl.g:19578:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalMenuDsl.g:19402:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalMenuDsl.g:19403:3: ruleXExpressionOrVarDeclaration
+            // InternalMenuDsl.g:19578:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19579:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
@@ -63311,17 +63877,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1"
-    // InternalMenuDsl.g:19412:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalMenuDsl.g:19588:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19416:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalMenuDsl.g:19417:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19592:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalMenuDsl.g:19593:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalMenuDsl.g:19417:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalMenuDsl.g:19418:3: ruleXExpressionOrVarDeclaration
+            // InternalMenuDsl.g:19593:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19594:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
@@ -63356,17 +63922,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__ExpressionAssignment_5"
-    // InternalMenuDsl.g:19427:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19603:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19431:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19432:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19607:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19608:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19432:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19433:3: ruleXExpression
+            // InternalMenuDsl.g:19608:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19609:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
@@ -63401,17 +63967,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0"
-    // InternalMenuDsl.g:19442:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19618:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19446:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19447:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19622:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19623:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19447:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19448:3: ruleXExpression
+            // InternalMenuDsl.g:19623:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19624:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
@@ -63446,17 +64012,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1"
-    // InternalMenuDsl.g:19457:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19633:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19461:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19462:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19637:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19638:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19462:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19463:3: ruleXExpression
+            // InternalMenuDsl.g:19638:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19639:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
@@ -63491,17 +64057,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__EachExpressionAssignment_9"
-    // InternalMenuDsl.g:19472:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19648:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19476:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19477:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19652:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19653:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19477:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19478:3: ruleXExpression
+            // InternalMenuDsl.g:19653:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19654:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
@@ -63536,17 +64102,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__PredicateAssignment_3"
-    // InternalMenuDsl.g:19487:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19663:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__PredicateAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19491:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19492:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19667:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19668:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19492:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19493:3: ruleXExpression
+            // InternalMenuDsl.g:19668:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19669:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
@@ -63581,17 +64147,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XWhileExpression__BodyAssignment_5"
-    // InternalMenuDsl.g:19502:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19678:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19506:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19507:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19682:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19683:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19507:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19508:3: ruleXExpression
+            // InternalMenuDsl.g:19683:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19684:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
@@ -63626,17 +64192,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__BodyAssignment_2"
-    // InternalMenuDsl.g:19517:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19693:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__BodyAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19521:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19522:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19697:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19698:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19522:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19523:3: ruleXExpression
+            // InternalMenuDsl.g:19698:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19699:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
@@ -63671,17 +64237,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XDoWhileExpression__PredicateAssignment_5"
-    // InternalMenuDsl.g:19532:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19708:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__PredicateAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19536:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19537:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19712:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19713:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19537:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19538:3: ruleXExpression
+            // InternalMenuDsl.g:19713:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19714:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
@@ -63716,17 +64282,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBlockExpression__ExpressionsAssignment_2_0"
-    // InternalMenuDsl.g:19547:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalMenuDsl.g:19723:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19551:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // InternalMenuDsl.g:19552:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19727:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalMenuDsl.g:19728:2: ( ruleXExpressionOrVarDeclaration )
             {
-            // InternalMenuDsl.g:19552:2: ( ruleXExpressionOrVarDeclaration )
-            // InternalMenuDsl.g:19553:3: ruleXExpressionOrVarDeclaration
+            // InternalMenuDsl.g:19728:2: ( ruleXExpressionOrVarDeclaration )
+            // InternalMenuDsl.g:19729:3: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
@@ -63761,28 +64327,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__WriteableAssignment_1_0"
-    // InternalMenuDsl.g:19562:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
+    // InternalMenuDsl.g:19738:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
     public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19566:1: ( ( ( 'var' ) ) )
-            // InternalMenuDsl.g:19567:2: ( ( 'var' ) )
+            // InternalMenuDsl.g:19742:1: ( ( ( 'var' ) ) )
+            // InternalMenuDsl.g:19743:2: ( ( 'var' ) )
             {
-            // InternalMenuDsl.g:19567:2: ( ( 'var' ) )
-            // InternalMenuDsl.g:19568:3: ( 'var' )
+            // InternalMenuDsl.g:19743:2: ( ( 'var' ) )
+            // InternalMenuDsl.g:19744:3: ( 'var' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            // InternalMenuDsl.g:19569:3: ( 'var' )
-            // InternalMenuDsl.g:19570:4: 'var'
+            // InternalMenuDsl.g:19745:3: ( 'var' )
+            // InternalMenuDsl.g:19746:4: 'var'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            match(input,104,FOLLOW_2); if (state.failed) return ;
+            match(input,106,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
@@ -63814,17 +64380,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__TypeAssignment_2_0_0_0"
-    // InternalMenuDsl.g:19581:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:19757: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 {
-            // InternalMenuDsl.g:19585:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:19586:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19761:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:19762:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:19586:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:19587:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:19762:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19763:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
@@ -63859,17 +64425,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_0_0_1"
-    // InternalMenuDsl.g:19596:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
+    // InternalMenuDsl.g:19772: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 {
-            // InternalMenuDsl.g:19600:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:19601:2: ( ruleValidID )
+            // InternalMenuDsl.g:19776:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:19777:2: ( ruleValidID )
             {
-            // InternalMenuDsl.g:19601:2: ( ruleValidID )
-            // InternalMenuDsl.g:19602:3: ruleValidID
+            // InternalMenuDsl.g:19777:2: ( ruleValidID )
+            // InternalMenuDsl.g:19778:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
@@ -63904,17 +64470,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_1"
-    // InternalMenuDsl.g:19611:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
+    // InternalMenuDsl.g:19787:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19615:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:19616:2: ( ruleValidID )
+            // InternalMenuDsl.g:19791:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:19792:2: ( ruleValidID )
             {
-            // InternalMenuDsl.g:19616:2: ( ruleValidID )
-            // InternalMenuDsl.g:19617:3: ruleValidID
+            // InternalMenuDsl.g:19792:2: ( ruleValidID )
+            // InternalMenuDsl.g:19793:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
@@ -63949,17 +64515,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XVariableDeclaration__RightAssignment_3_1"
-    // InternalMenuDsl.g:19626:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19802:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
     public final void rule__XVariableDeclaration__RightAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19630:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19631:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19806:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19807:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19631:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19632:3: ruleXExpression
+            // InternalMenuDsl.g:19807:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19808:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
@@ -63994,17 +64560,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmFormalParameter__ParameterTypeAssignment_0"
-    // InternalMenuDsl.g:19641:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:19817:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19645:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:19646:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19821:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:19822:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:19646:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:19647:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:19822:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19823:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
@@ -64039,17 +64605,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmFormalParameter__NameAssignment_1"
-    // InternalMenuDsl.g:19656:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalMenuDsl.g:19832:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__JvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19660:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:19661:2: ( ruleValidID )
+            // InternalMenuDsl.g:19836:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:19837:2: ( ruleValidID )
             {
-            // InternalMenuDsl.g:19661:2: ( ruleValidID )
-            // InternalMenuDsl.g:19662:3: ruleValidID
+            // InternalMenuDsl.g:19837:2: ( ruleValidID )
+            // InternalMenuDsl.g:19838:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
@@ -64084,17 +64650,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__ParameterTypeAssignment_0"
-    // InternalMenuDsl.g:19671:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:19847:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19675:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:19676:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19851:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:19852:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:19676:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:19677:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:19852:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:19853:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
@@ -64129,17 +64695,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__NameAssignment_1"
-    // InternalMenuDsl.g:19686:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalMenuDsl.g:19862:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FullJvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19690:1: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:19691:2: ( ruleValidID )
+            // InternalMenuDsl.g:19866:1: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:19867:2: ( ruleValidID )
             {
-            // InternalMenuDsl.g:19691:2: ( ruleValidID )
-            // InternalMenuDsl.g:19692:3: ruleValidID
+            // InternalMenuDsl.g:19867:2: ( ruleValidID )
+            // InternalMenuDsl.g:19868:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
@@ -64174,17 +64740,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_1"
-    // InternalMenuDsl.g:19701:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:19877:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19705:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:19706:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19881:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:19882:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:19706:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:19707:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:19882:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19883:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
@@ -64219,17 +64785,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_2_1"
-    // InternalMenuDsl.g:19716:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:19892:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19720:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:19721:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19896:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:19897:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:19721:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:19722:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:19897:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:19898:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
@@ -64264,23 +64830,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureAssignment_2"
-    // InternalMenuDsl.g:19731:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalMenuDsl.g:19907:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19735:1: ( ( ( ruleIdOrSuper ) ) )
-            // InternalMenuDsl.g:19736:2: ( ( ruleIdOrSuper ) )
+            // InternalMenuDsl.g:19911:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalMenuDsl.g:19912:2: ( ( ruleIdOrSuper ) )
             {
-            // InternalMenuDsl.g:19736:2: ( ( ruleIdOrSuper ) )
-            // InternalMenuDsl.g:19737:3: ( ruleIdOrSuper )
+            // InternalMenuDsl.g:19912:2: ( ( ruleIdOrSuper ) )
+            // InternalMenuDsl.g:19913:3: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
             }
-            // InternalMenuDsl.g:19738:3: ( ruleIdOrSuper )
-            // InternalMenuDsl.g:19739:4: ruleIdOrSuper
+            // InternalMenuDsl.g:19914:3: ( ruleIdOrSuper )
+            // InternalMenuDsl.g:19915:4: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_2_0_1()); 
@@ -64321,28 +64887,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__ExplicitOperationCallAssignment_3_0"
-    // InternalMenuDsl.g:19750:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
+    // InternalMenuDsl.g:19926:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
     public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19754:1: ( ( ( '(' ) ) )
-            // InternalMenuDsl.g:19755:2: ( ( '(' ) )
+            // InternalMenuDsl.g:19930:1: ( ( ( '(' ) ) )
+            // InternalMenuDsl.g:19931:2: ( ( '(' ) )
             {
-            // InternalMenuDsl.g:19755:2: ( ( '(' ) )
-            // InternalMenuDsl.g:19756:3: ( '(' )
+            // InternalMenuDsl.g:19931:2: ( ( '(' ) )
+            // InternalMenuDsl.g:19932:3: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            // InternalMenuDsl.g:19757:3: ( '(' )
-            // InternalMenuDsl.g:19758:4: '('
+            // InternalMenuDsl.g:19933:3: ( '(' )
+            // InternalMenuDsl.g:19934:4: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
@@ -64374,17 +64940,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0"
-    // InternalMenuDsl.g:19769:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalMenuDsl.g:19945:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19773:1: ( ( ruleXShortClosure ) )
-            // InternalMenuDsl.g:19774:2: ( ruleXShortClosure )
+            // InternalMenuDsl.g:19949:1: ( ( ruleXShortClosure ) )
+            // InternalMenuDsl.g:19950:2: ( ruleXShortClosure )
             {
-            // InternalMenuDsl.g:19774:2: ( ruleXShortClosure )
-            // InternalMenuDsl.g:19775:3: ruleXShortClosure
+            // InternalMenuDsl.g:19950:2: ( ruleXShortClosure )
+            // InternalMenuDsl.g:19951:3: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
@@ -64419,17 +64985,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0"
-    // InternalMenuDsl.g:19784:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19960: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 {
-            // InternalMenuDsl.g:19788:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19789:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19964:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19965:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19789:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19790:3: ruleXExpression
+            // InternalMenuDsl.g:19965:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19966:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
@@ -64464,17 +65030,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1"
-    // InternalMenuDsl.g:19799:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:19975: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 {
-            // InternalMenuDsl.g:19803:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19804:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19979:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:19980:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19804:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19805:3: ruleXExpression
+            // InternalMenuDsl.g:19980:2: ( ruleXExpression )
+            // InternalMenuDsl.g:19981:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
@@ -64509,17 +65075,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_4"
-    // InternalMenuDsl.g:19814:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
+    // InternalMenuDsl.g:19990:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19818:1: ( ( ruleXClosure ) )
-            // InternalMenuDsl.g:19819:2: ( ruleXClosure )
+            // InternalMenuDsl.g:19994:1: ( ( ruleXClosure ) )
+            // InternalMenuDsl.g:19995:2: ( ruleXClosure )
             {
-            // InternalMenuDsl.g:19819:2: ( ruleXClosure )
-            // InternalMenuDsl.g:19820:3: ruleXClosure
+            // InternalMenuDsl.g:19995:2: ( ruleXClosure )
+            // InternalMenuDsl.g:19996:3: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
@@ -64554,23 +65120,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__ConstructorAssignment_2"
-    // InternalMenuDsl.g:19829:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalMenuDsl.g:20005:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XConstructorCall__ConstructorAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19833:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalMenuDsl.g:19834:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:20009:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalMenuDsl.g:20010:2: ( ( ruleQualifiedName ) )
             {
-            // InternalMenuDsl.g:19834:2: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:19835:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:20010:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:20011:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
             }
-            // InternalMenuDsl.g:19836:3: ( ruleQualifiedName )
-            // InternalMenuDsl.g:19837:4: ruleQualifiedName
+            // InternalMenuDsl.g:20012:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:20013:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorQualifiedNameParserRuleCall_2_0_1()); 
@@ -64611,17 +65177,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_1"
-    // InternalMenuDsl.g:19848:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:20024:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19852:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:19853:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20028:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:20029:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:19853:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:19854:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:20029:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20030:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
@@ -64656,17 +65222,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_2_1"
-    // InternalMenuDsl.g:19863:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:20039:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19867:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:19868:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20043:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:20044:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:19868:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:19869:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:20044:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20045:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
@@ -64701,28 +65267,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0"
-    // InternalMenuDsl.g:19878:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
+    // InternalMenuDsl.g:20054:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
     public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19882:1: ( ( ( '(' ) ) )
-            // InternalMenuDsl.g:19883:2: ( ( '(' ) )
+            // InternalMenuDsl.g:20058:1: ( ( ( '(' ) ) )
+            // InternalMenuDsl.g:20059:2: ( ( '(' ) )
             {
-            // InternalMenuDsl.g:19883:2: ( ( '(' ) )
-            // InternalMenuDsl.g:19884:3: ( '(' )
+            // InternalMenuDsl.g:20059:2: ( ( '(' ) )
+            // InternalMenuDsl.g:20060:3: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            // InternalMenuDsl.g:19885:3: ( '(' )
-            // InternalMenuDsl.g:19886:4: '('
+            // InternalMenuDsl.g:20061:3: ( '(' )
+            // InternalMenuDsl.g:20062:4: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            match(input,61,FOLLOW_2); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
@@ -64754,17 +65320,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_0"
-    // InternalMenuDsl.g:19897:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
+    // InternalMenuDsl.g:20073:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19901:1: ( ( ruleXShortClosure ) )
-            // InternalMenuDsl.g:19902:2: ( ruleXShortClosure )
+            // InternalMenuDsl.g:20077:1: ( ( ruleXShortClosure ) )
+            // InternalMenuDsl.g:20078:2: ( ruleXShortClosure )
             {
-            // InternalMenuDsl.g:19902:2: ( ruleXShortClosure )
-            // InternalMenuDsl.g:19903:3: ruleXShortClosure
+            // InternalMenuDsl.g:20078:2: ( ruleXShortClosure )
+            // InternalMenuDsl.g:20079:3: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
@@ -64799,17 +65365,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_0"
-    // InternalMenuDsl.g:19912:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20088: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 {
-            // InternalMenuDsl.g:19916:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19917:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20092:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20093:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19917:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19918:3: ruleXExpression
+            // InternalMenuDsl.g:20093:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20094:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
@@ -64844,17 +65410,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1"
-    // InternalMenuDsl.g:19927:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20103: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 {
-            // InternalMenuDsl.g:19931:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:19932:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20107:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20108:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:19932:2: ( ruleXExpression )
-            // InternalMenuDsl.g:19933:3: ruleXExpression
+            // InternalMenuDsl.g:20108:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20109:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
@@ -64889,17 +65455,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_5"
-    // InternalMenuDsl.g:19942:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
+    // InternalMenuDsl.g:20118:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19946:1: ( ( ruleXClosure ) )
-            // InternalMenuDsl.g:19947:2: ( ruleXClosure )
+            // InternalMenuDsl.g:20122:1: ( ( ruleXClosure ) )
+            // InternalMenuDsl.g:20123:2: ( ruleXClosure )
             {
-            // InternalMenuDsl.g:19947:2: ( ruleXClosure )
-            // InternalMenuDsl.g:19948:3: ruleXClosure
+            // InternalMenuDsl.g:20123:2: ( ruleXClosure )
+            // InternalMenuDsl.g:20124:3: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
@@ -64934,28 +65500,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XBooleanLiteral__IsTrueAssignment_1_1"
-    // InternalMenuDsl.g:19957:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalMenuDsl.g:20133:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19961:1: ( ( ( 'true' ) ) )
-            // InternalMenuDsl.g:19962:2: ( ( 'true' ) )
+            // InternalMenuDsl.g:20137:1: ( ( ( 'true' ) ) )
+            // InternalMenuDsl.g:20138:2: ( ( 'true' ) )
             {
-            // InternalMenuDsl.g:19962:2: ( ( 'true' ) )
-            // InternalMenuDsl.g:19963:3: ( 'true' )
+            // InternalMenuDsl.g:20138:2: ( ( 'true' ) )
+            // InternalMenuDsl.g:20139:3: ( 'true' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            // InternalMenuDsl.g:19964:3: ( 'true' )
-            // InternalMenuDsl.g:19965:4: 'true'
+            // InternalMenuDsl.g:20140:3: ( 'true' )
+            // InternalMenuDsl.g:20141:4: 'true'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            match(input,105,FOLLOW_2); if (state.failed) return ;
+            match(input,107,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
@@ -64987,17 +65553,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XNumberLiteral__ValueAssignment_1"
-    // InternalMenuDsl.g:19976:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
+    // InternalMenuDsl.g:20152:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
     public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19980:1: ( ( ruleNumber ) )
-            // InternalMenuDsl.g:19981:2: ( ruleNumber )
+            // InternalMenuDsl.g:20156:1: ( ( ruleNumber ) )
+            // InternalMenuDsl.g:20157:2: ( ruleNumber )
             {
-            // InternalMenuDsl.g:19981:2: ( ruleNumber )
-            // InternalMenuDsl.g:19982:3: ruleNumber
+            // InternalMenuDsl.g:20157:2: ( ruleNumber )
+            // InternalMenuDsl.g:20158:3: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
@@ -65032,17 +65598,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XStringLiteral__ValueAssignment_1"
-    // InternalMenuDsl.g:19991:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalMenuDsl.g:20167:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:19995:1: ( ( RULE_STRING ) )
-            // InternalMenuDsl.g:19996:2: ( RULE_STRING )
+            // InternalMenuDsl.g:20171:1: ( ( RULE_STRING ) )
+            // InternalMenuDsl.g:20172:2: ( RULE_STRING )
             {
-            // InternalMenuDsl.g:19996:2: ( RULE_STRING )
-            // InternalMenuDsl.g:19997:3: RULE_STRING
+            // InternalMenuDsl.g:20172:2: ( RULE_STRING )
+            // InternalMenuDsl.g:20173:3: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
@@ -65073,23 +65639,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__TypeAssignment_3"
-    // InternalMenuDsl.g:20006:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
+    // InternalMenuDsl.g:20182:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20010:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalMenuDsl.g:20011:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:20186:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalMenuDsl.g:20187:2: ( ( ruleQualifiedName ) )
             {
-            // InternalMenuDsl.g:20011:2: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:20012:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:20187:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:20188:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
             }
-            // InternalMenuDsl.g:20013:3: ( ruleQualifiedName )
-            // InternalMenuDsl.g:20014:4: ruleQualifiedName
+            // InternalMenuDsl.g:20189:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:20190:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeQualifiedNameParserRuleCall_3_0_1()); 
@@ -65130,17 +65696,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTypeLiteral__ArrayDimensionsAssignment_4"
-    // InternalMenuDsl.g:20025:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
+    // InternalMenuDsl.g:20201:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
     public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20029:1: ( ( ruleArrayBrackets ) )
-            // InternalMenuDsl.g:20030:2: ( ruleArrayBrackets )
+            // InternalMenuDsl.g:20205:1: ( ( ruleArrayBrackets ) )
+            // InternalMenuDsl.g:20206:2: ( ruleArrayBrackets )
             {
-            // InternalMenuDsl.g:20030:2: ( ruleArrayBrackets )
-            // InternalMenuDsl.g:20031:3: ruleArrayBrackets
+            // InternalMenuDsl.g:20206:2: ( ruleArrayBrackets )
+            // InternalMenuDsl.g:20207:3: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
@@ -65175,17 +65741,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XThrowExpression__ExpressionAssignment_2"
-    // InternalMenuDsl.g:20040:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20216:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XThrowExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20044:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20045:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20220:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20221:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20045:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20046:3: ruleXExpression
+            // InternalMenuDsl.g:20221:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20222:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
@@ -65220,17 +65786,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XReturnExpression__ExpressionAssignment_2"
-    // InternalMenuDsl.g:20055:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20231:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XReturnExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20059:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20060:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20235:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20236:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20060:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20061:3: ruleXExpression
+            // InternalMenuDsl.g:20236:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20237:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
@@ -65265,17 +65831,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__ExpressionAssignment_2"
-    // InternalMenuDsl.g:20070:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20246:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20074:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20075:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20250:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20251:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20075:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20076:3: ruleXExpression
+            // InternalMenuDsl.g:20251:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20252:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
@@ -65310,17 +65876,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0"
-    // InternalMenuDsl.g:20085:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
+    // InternalMenuDsl.g:20261:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
     public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20089:1: ( ( ruleXCatchClause ) )
-            // InternalMenuDsl.g:20090:2: ( ruleXCatchClause )
+            // InternalMenuDsl.g:20265:1: ( ( ruleXCatchClause ) )
+            // InternalMenuDsl.g:20266:2: ( ruleXCatchClause )
             {
-            // InternalMenuDsl.g:20090:2: ( ruleXCatchClause )
-            // InternalMenuDsl.g:20091:3: ruleXCatchClause
+            // InternalMenuDsl.g:20266:2: ( ruleXCatchClause )
+            // InternalMenuDsl.g:20267:3: ruleXCatchClause
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
@@ -65355,17 +65921,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1"
-    // InternalMenuDsl.g:20100:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20276: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 {
-            // InternalMenuDsl.g:20104:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20105:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20280:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20281:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20105:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20106:3: ruleXExpression
+            // InternalMenuDsl.g:20281:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20282:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
@@ -65400,17 +65966,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1"
-    // InternalMenuDsl.g:20115:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20291:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20119:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20120:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20295:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20296:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20120:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20121:3: ruleXExpression
+            // InternalMenuDsl.g:20296:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20297:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
@@ -65445,17 +66011,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ParamAssignment_1"
-    // InternalMenuDsl.g:20130:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20306:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ParamAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20134:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20135:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20310:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20311:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20135:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20136:3: ruleXExpression
+            // InternalMenuDsl.g:20311:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20312:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
@@ -65490,17 +66056,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ExpressionAssignment_3"
-    // InternalMenuDsl.g:20145:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20321:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20149:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20150:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20325:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20326:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20150:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20151:3: ruleXExpression
+            // InternalMenuDsl.g:20326:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20327:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
@@ -65535,17 +66101,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__DeclaredParamAssignment_2"
-    // InternalMenuDsl.g:20160:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
+    // InternalMenuDsl.g:20336:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
     public final void rule__XCatchClause__DeclaredParamAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20164:1: ( ( ruleFullJvmFormalParameter ) )
-            // InternalMenuDsl.g:20165:2: ( ruleFullJvmFormalParameter )
+            // InternalMenuDsl.g:20340:1: ( ( ruleFullJvmFormalParameter ) )
+            // InternalMenuDsl.g:20341:2: ( ruleFullJvmFormalParameter )
             {
-            // InternalMenuDsl.g:20165:2: ( ruleFullJvmFormalParameter )
-            // InternalMenuDsl.g:20166:3: ruleFullJvmFormalParameter
+            // InternalMenuDsl.g:20341:2: ( ruleFullJvmFormalParameter )
+            // InternalMenuDsl.g:20342:3: ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
@@ -65580,17 +66146,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XCatchClause__ExpressionAssignment_4"
-    // InternalMenuDsl.g:20175:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
+    // InternalMenuDsl.g:20351:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
     public final void rule__XCatchClause__ExpressionAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20179:1: ( ( ruleXExpression ) )
-            // InternalMenuDsl.g:20180:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20355:1: ( ( ruleXExpression ) )
+            // InternalMenuDsl.g:20356:2: ( ruleXExpression )
             {
-            // InternalMenuDsl.g:20180:2: ( ruleXExpression )
-            // InternalMenuDsl.g:20181:3: ruleXExpression
+            // InternalMenuDsl.g:20356:2: ( ruleXExpression )
+            // InternalMenuDsl.g:20357:3: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
@@ -65625,17 +66191,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0"
-    // InternalMenuDsl.g:20190:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:20366:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20194:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:20195:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20370:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:20371:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:20195:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:20196:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:20371:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20372:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
@@ -65670,17 +66236,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1"
-    // InternalMenuDsl.g:20205:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:20381: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 {
-            // InternalMenuDsl.g:20209:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:20210:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20385:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:20386:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:20210:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:20211:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:20386:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20387:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
@@ -65715,17 +66281,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ReturnTypeAssignment_2"
-    // InternalMenuDsl.g:20220:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:20396:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20224:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:20225:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20400:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:20401:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:20225:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:20226:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:20401:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20402:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
@@ -65760,23 +66326,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_0"
-    // InternalMenuDsl.g:20235:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalMenuDsl.g:20411:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20239:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalMenuDsl.g:20240:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:20415:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalMenuDsl.g:20416:2: ( ( ruleQualifiedName ) )
             {
-            // InternalMenuDsl.g:20240:2: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:20241:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:20416:2: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:20417:3: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
             }
-            // InternalMenuDsl.g:20242:3: ( ruleQualifiedName )
-            // InternalMenuDsl.g:20243:4: ruleQualifiedName
+            // InternalMenuDsl.g:20418:3: ( ruleQualifiedName )
+            // InternalMenuDsl.g:20419:4: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeQualifiedNameParserRuleCall_0_0_1()); 
@@ -65817,17 +66383,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1"
-    // InternalMenuDsl.g:20254:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:20430:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20258:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:20259:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20434:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:20435:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:20259:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:20260:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:20435:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20436:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
@@ -65862,17 +66428,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1"
-    // InternalMenuDsl.g:20269:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:20445:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20273:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:20274:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20449:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:20450:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:20274:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:20275:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:20450:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20451:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
@@ -65907,23 +66473,23 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1"
-    // InternalMenuDsl.g:20284:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
+    // InternalMenuDsl.g:20460:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20288:1: ( ( ( ruleValidID ) ) )
-            // InternalMenuDsl.g:20289:2: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:20464:1: ( ( ( ruleValidID ) ) )
+            // InternalMenuDsl.g:20465:2: ( ( ruleValidID ) )
             {
-            // InternalMenuDsl.g:20289:2: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:20290:3: ( ruleValidID )
+            // InternalMenuDsl.g:20465:2: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:20466:3: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
             }
-            // InternalMenuDsl.g:20291:3: ( ruleValidID )
-            // InternalMenuDsl.g:20292:4: ruleValidID
+            // InternalMenuDsl.g:20467:3: ( ruleValidID )
+            // InternalMenuDsl.g:20468:4: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeValidIDParserRuleCall_1_4_1_0_1()); 
@@ -65964,17 +66530,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1"
-    // InternalMenuDsl.g:20303:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:20479: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 {
-            // InternalMenuDsl.g:20307:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:20308:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20483:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:20484:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:20308:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:20309:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:20484:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20485:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
@@ -66009,17 +66575,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1"
-    // InternalMenuDsl.g:20318:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalMenuDsl.g:20494: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 {
-            // InternalMenuDsl.g:20322:1: ( ( ruleJvmArgumentTypeReference ) )
-            // InternalMenuDsl.g:20323:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20498:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalMenuDsl.g:20499:2: ( ruleJvmArgumentTypeReference )
             {
-            // InternalMenuDsl.g:20323:2: ( ruleJvmArgumentTypeReference )
-            // InternalMenuDsl.g:20324:3: ruleJvmArgumentTypeReference
+            // InternalMenuDsl.g:20499:2: ( ruleJvmArgumentTypeReference )
+            // InternalMenuDsl.g:20500:3: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
@@ -66054,17 +66620,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0"
-    // InternalMenuDsl.g:20333:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
+    // InternalMenuDsl.g:20509:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20337:1: ( ( ruleJvmUpperBound ) )
-            // InternalMenuDsl.g:20338:2: ( ruleJvmUpperBound )
+            // InternalMenuDsl.g:20513:1: ( ( ruleJvmUpperBound ) )
+            // InternalMenuDsl.g:20514:2: ( ruleJvmUpperBound )
             {
-            // InternalMenuDsl.g:20338:2: ( ruleJvmUpperBound )
-            // InternalMenuDsl.g:20339:3: ruleJvmUpperBound
+            // InternalMenuDsl.g:20514:2: ( ruleJvmUpperBound )
+            // InternalMenuDsl.g:20515:3: ruleJvmUpperBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
@@ -66099,17 +66665,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1"
-    // InternalMenuDsl.g:20348:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
+    // InternalMenuDsl.g:20524:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20352:1: ( ( ruleJvmUpperBoundAnded ) )
-            // InternalMenuDsl.g:20353:2: ( ruleJvmUpperBoundAnded )
+            // InternalMenuDsl.g:20528:1: ( ( ruleJvmUpperBoundAnded ) )
+            // InternalMenuDsl.g:20529:2: ( ruleJvmUpperBoundAnded )
             {
-            // InternalMenuDsl.g:20353:2: ( ruleJvmUpperBoundAnded )
-            // InternalMenuDsl.g:20354:3: ruleJvmUpperBoundAnded
+            // InternalMenuDsl.g:20529:2: ( ruleJvmUpperBoundAnded )
+            // InternalMenuDsl.g:20530:3: ruleJvmUpperBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
@@ -66144,17 +66710,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0"
-    // InternalMenuDsl.g:20363:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
+    // InternalMenuDsl.g:20539:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20367:1: ( ( ruleJvmLowerBound ) )
-            // InternalMenuDsl.g:20368:2: ( ruleJvmLowerBound )
+            // InternalMenuDsl.g:20543:1: ( ( ruleJvmLowerBound ) )
+            // InternalMenuDsl.g:20544:2: ( ruleJvmLowerBound )
             {
-            // InternalMenuDsl.g:20368:2: ( ruleJvmLowerBound )
-            // InternalMenuDsl.g:20369:3: ruleJvmLowerBound
+            // InternalMenuDsl.g:20544:2: ( ruleJvmLowerBound )
+            // InternalMenuDsl.g:20545:3: ruleJvmLowerBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
@@ -66189,17 +66755,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1"
-    // InternalMenuDsl.g:20378:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
+    // InternalMenuDsl.g:20554:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20382:1: ( ( ruleJvmLowerBoundAnded ) )
-            // InternalMenuDsl.g:20383:2: ( ruleJvmLowerBoundAnded )
+            // InternalMenuDsl.g:20558:1: ( ( ruleJvmLowerBoundAnded ) )
+            // InternalMenuDsl.g:20559:2: ( ruleJvmLowerBoundAnded )
             {
-            // InternalMenuDsl.g:20383:2: ( ruleJvmLowerBoundAnded )
-            // InternalMenuDsl.g:20384:3: ruleJvmLowerBoundAnded
+            // InternalMenuDsl.g:20559:2: ( ruleJvmLowerBoundAnded )
+            // InternalMenuDsl.g:20560:3: ruleJvmLowerBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
@@ -66234,17 +66800,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBound__TypeReferenceAssignment_1"
-    // InternalMenuDsl.g:20393:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:20569:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20397:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:20398:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20573:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:20574:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:20398:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:20399:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:20574:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20575:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -66279,17 +66845,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__TypeReferenceAssignment_1"
-    // InternalMenuDsl.g:20408:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:20584:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20412:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:20413:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20588:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:20589:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:20413:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:20414:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:20589:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20590:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -66324,17 +66890,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBound__TypeReferenceAssignment_1"
-    // InternalMenuDsl.g:20423:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:20599:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20427:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:20428:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20603:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:20604:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:20428:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:20429:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:20604:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20605:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -66369,17 +66935,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__TypeReferenceAssignment_1"
-    // InternalMenuDsl.g:20438:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalMenuDsl.g:20614:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20442:1: ( ( ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:20443:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20618:1: ( ( ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:20619:2: ( ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:20443:2: ( ruleJvmTypeReference )
-            // InternalMenuDsl.g:20444:3: ruleJvmTypeReference
+            // InternalMenuDsl.g:20619:2: ( ruleJvmTypeReference )
+            // InternalMenuDsl.g:20620:3: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
@@ -66414,17 +66980,17 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__XImportSection__ImportDeclarationsAssignment"
-    // InternalMenuDsl.g:20453:1: rule__XImportSection__ImportDeclarationsAssignment : ( ruleXImportDeclaration ) ;
+    // InternalMenuDsl.g:20629:1: rule__XImportSection__ImportDeclarationsAssignment : ( ruleXImportDeclaration ) ;
     public final void rule__XImportSection__ImportDeclarationsAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         	
         try {
-            // InternalMenuDsl.g:20457:1: ( ( ruleXImportDeclaration ) )
-            // InternalMenuDsl.g:20458:2: ( ruleXImportDeclaration )
+            // InternalMenuDsl.g:20633:1: ( ( ruleXImportDeclaration ) )
+            // InternalMenuDsl.g:20634:2: ( ruleXImportDeclaration )
             {
-            // InternalMenuDsl.g:20458:2: ( ruleXImportDeclaration )
-            // InternalMenuDsl.g:20459:3: ruleXImportDeclaration
+            // InternalMenuDsl.g:20634:2: ( ruleXImportDeclaration )
+            // InternalMenuDsl.g:20635:3: ruleXImportDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsXImportDeclarationParserRuleCall_0()); 
@@ -66457,19 +67023,19 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     }
     // $ANTLR end "rule__XImportSection__ImportDeclarationsAssignment"
 
-    // $ANTLR start synpred12_InternalMenuDsl
-    public final void synpred12_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2329:2: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) )
-        // InternalMenuDsl.g:2329:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+    // $ANTLR start synpred14_InternalMenuDsl
+    public final void synpred14_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:2406:2: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) )
+        // InternalMenuDsl.g:2406:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
         {
-        // InternalMenuDsl.g:2329:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
-        // InternalMenuDsl.g:2330:3: ( rule__XAnnotation__Group_3_1_0__0 )
+        // InternalMenuDsl.g:2406:2: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+        // InternalMenuDsl.g:2407:3: ( rule__XAnnotation__Group_3_1_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0()); 
         }
-        // InternalMenuDsl.g:2331:3: ( rule__XAnnotation__Group_3_1_0__0 )
-        // InternalMenuDsl.g:2331:4: rule__XAnnotation__Group_3_1_0__0
+        // InternalMenuDsl.g:2408:3: ( rule__XAnnotation__Group_3_1_0__0 )
+        // InternalMenuDsl.g:2408:4: rule__XAnnotation__Group_3_1_0__0
         {
         pushFollow(FOLLOW_2);
         rule__XAnnotation__Group_3_1_0__0();
@@ -66485,21 +67051,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred12_InternalMenuDsl
+    // $ANTLR end synpred14_InternalMenuDsl
 
-    // $ANTLR start synpred13_InternalMenuDsl
-    public final void synpred13_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2350:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) )
-        // InternalMenuDsl.g:2350:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+    // $ANTLR start synpred15_InternalMenuDsl
+    public final void synpred15_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:2427:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) )
+        // InternalMenuDsl.g:2427:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
         {
-        // InternalMenuDsl.g:2350:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
-        // InternalMenuDsl.g:2351:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+        // InternalMenuDsl.g:2427:2: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+        // InternalMenuDsl.g:2428:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0()); 
         }
-        // InternalMenuDsl.g:2352:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
-        // InternalMenuDsl.g:2352:4: rule__XAnnotationElementValueOrCommaList__Group_0__0
+        // InternalMenuDsl.g:2429:3: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+        // InternalMenuDsl.g:2429:4: rule__XAnnotationElementValueOrCommaList__Group_0__0
         {
         pushFollow(FOLLOW_2);
         rule__XAnnotationElementValueOrCommaList__Group_0__0();
@@ -66515,21 +67081,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred13_InternalMenuDsl
+    // $ANTLR end synpred15_InternalMenuDsl
 
-    // $ANTLR start synpred14_InternalMenuDsl
-    public final void synpred14_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2371:2: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) )
-        // InternalMenuDsl.g:2371:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+    // $ANTLR start synpred16_InternalMenuDsl
+    public final void synpred16_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:2448:2: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) )
+        // InternalMenuDsl.g:2448:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
         {
-        // InternalMenuDsl.g:2371:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
-        // InternalMenuDsl.g:2372:3: ( rule__XAnnotationElementValue__Group_0__0 )
+        // InternalMenuDsl.g:2448:2: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+        // InternalMenuDsl.g:2449:3: ( rule__XAnnotationElementValue__Group_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0()); 
         }
-        // InternalMenuDsl.g:2373:3: ( rule__XAnnotationElementValue__Group_0__0 )
-        // InternalMenuDsl.g:2373:4: rule__XAnnotationElementValue__Group_0__0
+        // InternalMenuDsl.g:2450:3: ( rule__XAnnotationElementValue__Group_0__0 )
+        // InternalMenuDsl.g:2450:4: rule__XAnnotationElementValue__Group_0__0
         {
         pushFollow(FOLLOW_2);
         rule__XAnnotationElementValue__Group_0__0();
@@ -66545,21 +67111,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred14_InternalMenuDsl
+    // $ANTLR end synpred16_InternalMenuDsl
 
-    // $ANTLR start synpred39_InternalMenuDsl
-    public final void synpred39_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2656:2: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
-        // InternalMenuDsl.g:2656:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
+    // $ANTLR start synpred41_InternalMenuDsl
+    public final void synpred41_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:2733:2: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
+        // InternalMenuDsl.g:2733:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
         {
-        // InternalMenuDsl.g:2656:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
-        // InternalMenuDsl.g:2657:3: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalMenuDsl.g:2733:2: ( ( rule__OpOther__Group_6_1_0__0 ) )
+        // InternalMenuDsl.g:2734:3: ( rule__OpOther__Group_6_1_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
         }
-        // InternalMenuDsl.g:2658:3: ( rule__OpOther__Group_6_1_0__0 )
-        // InternalMenuDsl.g:2658:4: rule__OpOther__Group_6_1_0__0
+        // InternalMenuDsl.g:2735:3: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalMenuDsl.g:2735:4: rule__OpOther__Group_6_1_0__0
         {
         pushFollow(FOLLOW_2);
         rule__OpOther__Group_6_1_0__0();
@@ -66575,15 +67141,15 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred39_InternalMenuDsl
+    // $ANTLR end synpred41_InternalMenuDsl
 
-    // $ANTLR start synpred40_InternalMenuDsl
-    public final void synpred40_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2662:2: ( ( '<' ) )
-        // InternalMenuDsl.g:2662:2: ( '<' )
+    // $ANTLR start synpred42_InternalMenuDsl
+    public final void synpred42_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:2739:2: ( ( '<' ) )
+        // InternalMenuDsl.g:2739:2: ( '<' )
         {
-        // InternalMenuDsl.g:2662:2: ( '<' )
-        // InternalMenuDsl.g:2663:3: '<'
+        // InternalMenuDsl.g:2739:2: ( '<' )
+        // InternalMenuDsl.g:2740:3: '<'
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
@@ -66595,21 +67161,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred40_InternalMenuDsl
+    // $ANTLR end synpred42_InternalMenuDsl
 
-    // $ANTLR start synpred53_InternalMenuDsl
-    public final void synpred53_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2875:2: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
-        // InternalMenuDsl.g:2875:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+    // $ANTLR start synpred55_InternalMenuDsl
+    public final void synpred55_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:2952:2: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
+        // InternalMenuDsl.g:2952:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
         {
-        // InternalMenuDsl.g:2875:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-        // InternalMenuDsl.g:2876:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalMenuDsl.g:2952:2: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+        // InternalMenuDsl.g:2953:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
         }
-        // InternalMenuDsl.g:2877:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-        // InternalMenuDsl.g:2877:4: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+        // InternalMenuDsl.g:2954:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalMenuDsl.g:2954:4: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
         {
         pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
@@ -66625,21 +67191,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred53_InternalMenuDsl
+    // $ANTLR end synpred55_InternalMenuDsl
 
-    // $ANTLR start synpred61_InternalMenuDsl
-    public final void synpred61_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2938:2: ( ( ( ruleXForLoopExpression ) ) )
-        // InternalMenuDsl.g:2938:2: ( ( ruleXForLoopExpression ) )
+    // $ANTLR start synpred63_InternalMenuDsl
+    public final void synpred63_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:3015:2: ( ( ( ruleXForLoopExpression ) ) )
+        // InternalMenuDsl.g:3015:2: ( ( ruleXForLoopExpression ) )
         {
-        // InternalMenuDsl.g:2938:2: ( ( ruleXForLoopExpression ) )
-        // InternalMenuDsl.g:2939:3: ( ruleXForLoopExpression )
+        // InternalMenuDsl.g:3015:2: ( ( ruleXForLoopExpression ) )
+        // InternalMenuDsl.g:3016:3: ( ruleXForLoopExpression )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
         }
-        // InternalMenuDsl.g:2940:3: ( ruleXForLoopExpression )
-        // InternalMenuDsl.g:2940:4: ruleXForLoopExpression
+        // InternalMenuDsl.g:3017:3: ( ruleXForLoopExpression )
+        // InternalMenuDsl.g:3017:4: ruleXForLoopExpression
         {
         pushFollow(FOLLOW_2);
         ruleXForLoopExpression();
@@ -66655,15 +67221,15 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred61_InternalMenuDsl
+    // $ANTLR end synpred63_InternalMenuDsl
 
-    // $ANTLR start synpred62_InternalMenuDsl
-    public final void synpred62_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2944:2: ( ( ruleXBasicForLoopExpression ) )
-        // InternalMenuDsl.g:2944:2: ( ruleXBasicForLoopExpression )
+    // $ANTLR start synpred64_InternalMenuDsl
+    public final void synpred64_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:3021:2: ( ( ruleXBasicForLoopExpression ) )
+        // InternalMenuDsl.g:3021:2: ( ruleXBasicForLoopExpression )
         {
-        // InternalMenuDsl.g:2944:2: ( ruleXBasicForLoopExpression )
-        // InternalMenuDsl.g:2945:3: ruleXBasicForLoopExpression
+        // InternalMenuDsl.g:3021:2: ( ruleXBasicForLoopExpression )
+        // InternalMenuDsl.g:3022:3: ruleXBasicForLoopExpression
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
@@ -66679,21 +67245,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred62_InternalMenuDsl
+    // $ANTLR end synpred64_InternalMenuDsl
 
-    // $ANTLR start synpred75_InternalMenuDsl
-    public final void synpred75_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3067:2: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
-        // InternalMenuDsl.g:3067:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+    // $ANTLR start synpred77_InternalMenuDsl
+    public final void synpred77_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:3144:2: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
+        // InternalMenuDsl.g:3144:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
         {
-        // InternalMenuDsl.g:3067:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-        // InternalMenuDsl.g:3068:3: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalMenuDsl.g:3144:2: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+        // InternalMenuDsl.g:3145:3: ( rule__XSwitchExpression__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
         }
-        // InternalMenuDsl.g:3069:3: ( rule__XSwitchExpression__Group_2_0__0 )
-        // InternalMenuDsl.g:3069:4: rule__XSwitchExpression__Group_2_0__0
+        // InternalMenuDsl.g:3146:3: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalMenuDsl.g:3146:4: rule__XSwitchExpression__Group_2_0__0
         {
         pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_0__0();
@@ -66709,21 +67275,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred75_InternalMenuDsl
+    // $ANTLR end synpred77_InternalMenuDsl
 
-    // $ANTLR start synpred79_InternalMenuDsl
-    public final void synpred79_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3151:2: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
-        // InternalMenuDsl.g:3151:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+    // $ANTLR start synpred81_InternalMenuDsl
+    public final void synpred81_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:3228:2: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
+        // InternalMenuDsl.g:3228:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
         {
-        // InternalMenuDsl.g:3151:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-        // InternalMenuDsl.g:3152:3: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalMenuDsl.g:3228:2: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+        // InternalMenuDsl.g:3229:3: ( rule__XVariableDeclaration__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
         }
-        // InternalMenuDsl.g:3153:3: ( rule__XVariableDeclaration__Group_2_0__0 )
-        // InternalMenuDsl.g:3153:4: rule__XVariableDeclaration__Group_2_0__0
+        // InternalMenuDsl.g:3230:3: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalMenuDsl.g:3230:4: rule__XVariableDeclaration__Group_2_0__0
         {
         pushFollow(FOLLOW_2);
         rule__XVariableDeclaration__Group_2_0__0();
@@ -66739,21 +67305,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred79_InternalMenuDsl
+    // $ANTLR end synpred81_InternalMenuDsl
 
-    // $ANTLR start synpred80_InternalMenuDsl
-    public final void synpred80_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3172:2: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
-        // InternalMenuDsl.g:3172:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+    // $ANTLR start synpred82_InternalMenuDsl
+    public final void synpred82_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:3249:2: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
+        // InternalMenuDsl.g:3249:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
         {
-        // InternalMenuDsl.g:3172:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-        // InternalMenuDsl.g:3173:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalMenuDsl.g:3249:2: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+        // InternalMenuDsl.g:3250:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
         }
-        // InternalMenuDsl.g:3174:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-        // InternalMenuDsl.g:3174:4: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+        // InternalMenuDsl.g:3251:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalMenuDsl.g:3251:4: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
         {
         pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
@@ -66769,21 +67335,21 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred80_InternalMenuDsl
+    // $ANTLR end synpred82_InternalMenuDsl
 
-    // $ANTLR start synpred86_InternalMenuDsl
-    public final void synpred86_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3253:2: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
-        // InternalMenuDsl.g:3253:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+    // $ANTLR start synpred88_InternalMenuDsl
+    public final void synpred88_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:3330:2: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
+        // InternalMenuDsl.g:3330:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
         {
-        // InternalMenuDsl.g:3253:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-        // InternalMenuDsl.g:3254:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalMenuDsl.g:3330:2: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+        // InternalMenuDsl.g:3331:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
         }
-        // InternalMenuDsl.g:3255:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-        // InternalMenuDsl.g:3255:4: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+        // InternalMenuDsl.g:3332:3: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalMenuDsl.g:3332:4: rule__XConstructorCall__ArgumentsAssignment_4_1_0
         {
         pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_4_1_0();
@@ -66799,12 +67365,12 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred86_InternalMenuDsl
+    // $ANTLR end synpred88_InternalMenuDsl
 
-    // $ANTLR start synpred120_InternalMenuDsl
-    public final void synpred120_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6243:3: ( rule__XAssignment__Group_1_1__0 )
-        // InternalMenuDsl.g:6243:3: rule__XAssignment__Group_1_1__0
+    // $ANTLR start synpred119_InternalMenuDsl
+    public final void synpred119_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:6374:3: ( rule__XAssignment__Group_1_1__0 )
+        // InternalMenuDsl.g:6374:3: rule__XAssignment__Group_1_1__0
         {
         pushFollow(FOLLOW_2);
         rule__XAssignment__Group_1_1__0();
@@ -66814,15 +67380,30 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred120_InternalMenuDsl
+    // $ANTLR end synpred119_InternalMenuDsl
+
+    // $ANTLR start synpred121_InternalMenuDsl
+    public final void synpred121_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:6725:3: ( rule__XOrExpression__Group_1__0 )
+        // InternalMenuDsl.g:6725:3: rule__XOrExpression__Group_1__0
+        {
+        pushFollow(FOLLOW_2);
+        rule__XOrExpression__Group_1__0();
+
+        state._fsp--;
+        if (state.failed) return ;
+
+        }
+    }
+    // $ANTLR end synpred121_InternalMenuDsl
 
     // $ANTLR start synpred122_InternalMenuDsl
     public final void synpred122_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6594:3: ( rule__XOrExpression__Group_1__0 )
-        // InternalMenuDsl.g:6594:3: rule__XOrExpression__Group_1__0
+        // InternalMenuDsl.g:6914:3: ( rule__XAndExpression__Group_1__0 )
+        // InternalMenuDsl.g:6914:3: rule__XAndExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XOrExpression__Group_1__0();
+        rule__XAndExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66833,11 +67414,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred123_InternalMenuDsl
     public final void synpred123_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6783:3: ( rule__XAndExpression__Group_1__0 )
-        // InternalMenuDsl.g:6783:3: rule__XAndExpression__Group_1__0
+        // InternalMenuDsl.g:7103:3: ( rule__XEqualityExpression__Group_1__0 )
+        // InternalMenuDsl.g:7103:3: rule__XEqualityExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XAndExpression__Group_1__0();
+        rule__XEqualityExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66848,11 +67429,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred124_InternalMenuDsl
     public final void synpred124_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6972:3: ( rule__XEqualityExpression__Group_1__0 )
-        // InternalMenuDsl.g:6972:3: rule__XEqualityExpression__Group_1__0
+        // InternalMenuDsl.g:7292:3: ( rule__XRelationalExpression__Alternatives_1 )
+        // InternalMenuDsl.g:7292:3: rule__XRelationalExpression__Alternatives_1
         {
         pushFollow(FOLLOW_2);
-        rule__XEqualityExpression__Group_1__0();
+        rule__XRelationalExpression__Alternatives_1();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66863,11 +67444,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred125_InternalMenuDsl
     public final void synpred125_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:7161:3: ( rule__XRelationalExpression__Alternatives_1 )
-        // InternalMenuDsl.g:7161:3: rule__XRelationalExpression__Alternatives_1
+        // InternalMenuDsl.g:7670:3: ( rule__XOtherOperatorExpression__Group_1__0 )
+        // InternalMenuDsl.g:7670:3: rule__XOtherOperatorExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XRelationalExpression__Alternatives_1();
+        rule__XOtherOperatorExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66878,11 +67459,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred126_InternalMenuDsl
     public final void synpred126_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:7539:3: ( rule__XOtherOperatorExpression__Group_1__0 )
-        // InternalMenuDsl.g:7539:3: rule__XOtherOperatorExpression__Group_1__0
+        // InternalMenuDsl.g:8183:3: ( rule__XAdditiveExpression__Group_1__0 )
+        // InternalMenuDsl.g:8183:3: rule__XAdditiveExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XOtherOperatorExpression__Group_1__0();
+        rule__XAdditiveExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66893,11 +67474,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred127_InternalMenuDsl
     public final void synpred127_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:8052:3: ( rule__XAdditiveExpression__Group_1__0 )
-        // InternalMenuDsl.g:8052:3: rule__XAdditiveExpression__Group_1__0
+        // InternalMenuDsl.g:8372:3: ( rule__XMultiplicativeExpression__Group_1__0 )
+        // InternalMenuDsl.g:8372:3: rule__XMultiplicativeExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XAdditiveExpression__Group_1__0();
+        rule__XMultiplicativeExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66908,11 +67489,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred128_InternalMenuDsl
     public final void synpred128_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:8241:3: ( rule__XMultiplicativeExpression__Group_1__0 )
-        // InternalMenuDsl.g:8241:3: rule__XMultiplicativeExpression__Group_1__0
+        // InternalMenuDsl.g:8642:3: ( rule__XCastedExpression__Group_1__0 )
+        // InternalMenuDsl.g:8642:3: rule__XCastedExpression__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XMultiplicativeExpression__Group_1__0();
+        rule__XCastedExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66923,11 +67504,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred129_InternalMenuDsl
     public final void synpred129_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:8511:3: ( rule__XCastedExpression__Group_1__0 )
-        // InternalMenuDsl.g:8511:3: rule__XCastedExpression__Group_1__0
+        // InternalMenuDsl.g:8831:3: ( rule__XPostfixOperation__Group_1__0 )
+        // InternalMenuDsl.g:8831:3: rule__XPostfixOperation__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XCastedExpression__Group_1__0();
+        rule__XPostfixOperation__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66938,11 +67519,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred130_InternalMenuDsl
     public final void synpred130_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:8700:3: ( rule__XPostfixOperation__Group_1__0 )
-        // InternalMenuDsl.g:8700:3: rule__XPostfixOperation__Group_1__0
+        // InternalMenuDsl.g:8966:3: ( rule__XMemberFeatureCall__Alternatives_1 )
+        // InternalMenuDsl.g:8966:3: rule__XMemberFeatureCall__Alternatives_1
         {
         pushFollow(FOLLOW_2);
-        rule__XPostfixOperation__Group_1__0();
+        rule__XMemberFeatureCall__Alternatives_1();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66951,28 +67532,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     }
     // $ANTLR end synpred130_InternalMenuDsl
 
-    // $ANTLR start synpred131_InternalMenuDsl
-    public final void synpred131_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:8835:3: ( rule__XMemberFeatureCall__Alternatives_1 )
-        // InternalMenuDsl.g:8835:3: rule__XMemberFeatureCall__Alternatives_1
+    // $ANTLR start synpred132_InternalMenuDsl
+    public final void synpred132_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:9264:3: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
+        // InternalMenuDsl.g:9264:3: rule__XMemberFeatureCall__Group_1_1_3__0
         {
         pushFollow(FOLLOW_2);
-        rule__XMemberFeatureCall__Alternatives_1();
+        rule__XMemberFeatureCall__Group_1_1_3__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred131_InternalMenuDsl
+    // $ANTLR end synpred132_InternalMenuDsl
 
     // $ANTLR start synpred133_InternalMenuDsl
     public final void synpred133_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:9133:3: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
-        // InternalMenuDsl.g:9133:3: rule__XMemberFeatureCall__Group_1_1_3__0
+        // InternalMenuDsl.g:9290:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
+        // InternalMenuDsl.g:9290:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
         {
         pushFollow(FOLLOW_2);
-        rule__XMemberFeatureCall__Group_1_1_3__0();
+        rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
         state._fsp--;
         if (state.failed) return ;
@@ -66981,73 +67562,73 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     }
     // $ANTLR end synpred133_InternalMenuDsl
 
-    // $ANTLR start synpred134_InternalMenuDsl
-    public final void synpred134_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:9159:3: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
-        // InternalMenuDsl.g:9159:3: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+    // $ANTLR start synpred141_InternalMenuDsl
+    public final void synpred141_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:10263:3: ( rule__XClosure__Group_1__0 )
+        // InternalMenuDsl.g:10263:3: rule__XClosure__Group_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
+        rule__XClosure__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred134_InternalMenuDsl
+    // $ANTLR end synpred141_InternalMenuDsl
 
-    // $ANTLR start synpred142_InternalMenuDsl
-    public final void synpred142_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:10132:3: ( rule__XClosure__Group_1__0 )
-        // InternalMenuDsl.g:10132:3: rule__XClosure__Group_1__0
+    // $ANTLR start synpred148_InternalMenuDsl
+    public final void synpred148_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:11234:3: ( rule__XIfExpression__Group_6__0 )
+        // InternalMenuDsl.g:11234:3: rule__XIfExpression__Group_6__0
         {
         pushFollow(FOLLOW_2);
-        rule__XClosure__Group_1__0();
+        rule__XIfExpression__Group_6__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred142_InternalMenuDsl
+    // $ANTLR end synpred148_InternalMenuDsl
 
-    // $ANTLR start synpred149_InternalMenuDsl
-    public final void synpred149_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:11103:3: ( rule__XIfExpression__Group_6__0 )
-        // InternalMenuDsl.g:11103:3: rule__XIfExpression__Group_6__0
+    // $ANTLR start synpred151_InternalMenuDsl
+    public final void synpred151_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:11694:3: ( rule__XSwitchExpression__Group_2_1_0__0 )
+        // InternalMenuDsl.g:11694:3: rule__XSwitchExpression__Group_2_1_0__0
         {
         pushFollow(FOLLOW_2);
-        rule__XIfExpression__Group_6__0();
+        rule__XSwitchExpression__Group_2_1_0__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred149_InternalMenuDsl
+    // $ANTLR end synpred151_InternalMenuDsl
 
-    // $ANTLR start synpred152_InternalMenuDsl
-    public final void synpred152_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:11563:3: ( rule__XSwitchExpression__Group_2_1_0__0 )
-        // InternalMenuDsl.g:11563:3: rule__XSwitchExpression__Group_2_1_0__0
+    // $ANTLR start synpred164_InternalMenuDsl
+    public final void synpred164_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:13827:3: ( rule__XFeatureCall__Group_3__0 )
+        // InternalMenuDsl.g:13827:3: rule__XFeatureCall__Group_3__0
         {
         pushFollow(FOLLOW_2);
-        rule__XSwitchExpression__Group_2_1_0__0();
+        rule__XFeatureCall__Group_3__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred152_InternalMenuDsl
+    // $ANTLR end synpred164_InternalMenuDsl
 
     // $ANTLR start synpred165_InternalMenuDsl
     public final void synpred165_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:13696:3: ( rule__XFeatureCall__Group_3__0 )
-        // InternalMenuDsl.g:13696:3: rule__XFeatureCall__Group_3__0
+        // InternalMenuDsl.g:13853:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
+        // InternalMenuDsl.g:13853:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
         {
         pushFollow(FOLLOW_2);
-        rule__XFeatureCall__Group_3__0();
+        rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
         state._fsp--;
         if (state.failed) return ;
@@ -67056,28 +67637,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     }
     // $ANTLR end synpred165_InternalMenuDsl
 
-    // $ANTLR start synpred166_InternalMenuDsl
-    public final void synpred166_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:13722:3: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
-        // InternalMenuDsl.g:13722:3: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+    // $ANTLR start synpred169_InternalMenuDsl
+    public final void synpred169_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:14313:3: ( rule__XConstructorCall__Group_3__0 )
+        // InternalMenuDsl.g:14313:3: rule__XConstructorCall__Group_3__0
         {
         pushFollow(FOLLOW_2);
-        rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
+        rule__XConstructorCall__Group_3__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred166_InternalMenuDsl
+    // $ANTLR end synpred169_InternalMenuDsl
 
     // $ANTLR start synpred170_InternalMenuDsl
     public final void synpred170_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:14182:3: ( rule__XConstructorCall__Group_3__0 )
-        // InternalMenuDsl.g:14182:3: rule__XConstructorCall__Group_3__0
+        // InternalMenuDsl.g:14340:3: ( rule__XConstructorCall__Group_4__0 )
+        // InternalMenuDsl.g:14340:3: rule__XConstructorCall__Group_4__0
         {
         pushFollow(FOLLOW_2);
-        rule__XConstructorCall__Group_3__0();
+        rule__XConstructorCall__Group_4__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -67088,11 +67669,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred171_InternalMenuDsl
     public final void synpred171_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:14209:3: ( rule__XConstructorCall__Group_4__0 )
-        // InternalMenuDsl.g:14209:3: rule__XConstructorCall__Group_4__0
+        // InternalMenuDsl.g:14366:3: ( rule__XConstructorCall__ArgumentsAssignment_5 )
+        // InternalMenuDsl.g:14366:3: rule__XConstructorCall__ArgumentsAssignment_5
         {
         pushFollow(FOLLOW_2);
-        rule__XConstructorCall__Group_4__0();
+        rule__XConstructorCall__ArgumentsAssignment_5();
 
         state._fsp--;
         if (state.failed) return ;
@@ -67101,28 +67682,28 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     }
     // $ANTLR end synpred171_InternalMenuDsl
 
-    // $ANTLR start synpred172_InternalMenuDsl
-    public final void synpred172_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:14235:3: ( rule__XConstructorCall__ArgumentsAssignment_5 )
-        // InternalMenuDsl.g:14235:3: rule__XConstructorCall__ArgumentsAssignment_5
+    // $ANTLR start synpred176_InternalMenuDsl
+    public final void synpred176_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:15257:3: ( rule__XReturnExpression__ExpressionAssignment_2 )
+        // InternalMenuDsl.g:15257:3: rule__XReturnExpression__ExpressionAssignment_2
         {
         pushFollow(FOLLOW_2);
-        rule__XConstructorCall__ArgumentsAssignment_5();
+        rule__XReturnExpression__ExpressionAssignment_2();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred172_InternalMenuDsl
+    // $ANTLR end synpred176_InternalMenuDsl
 
     // $ANTLR start synpred177_InternalMenuDsl
     public final void synpred177_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:15126:3: ( rule__XReturnExpression__ExpressionAssignment_2 )
-        // InternalMenuDsl.g:15126:3: rule__XReturnExpression__ExpressionAssignment_2
+        // InternalMenuDsl.g:15399:4: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+        // InternalMenuDsl.g:15399:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
         {
         pushFollow(FOLLOW_2);
-        rule__XReturnExpression__ExpressionAssignment_2();
+        rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -67133,11 +67714,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred178_InternalMenuDsl
     public final void synpred178_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:15268:4: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-        // InternalMenuDsl.g:15268:4: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+        // InternalMenuDsl.g:15426:3: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
+        // InternalMenuDsl.g:15426:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
         {
         pushFollow(FOLLOW_2);
-        rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
+        rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -67148,23 +67729,8 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
     // $ANTLR start synpred179_InternalMenuDsl
     public final void synpred179_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:15295:3: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
-        // InternalMenuDsl.g:15295:3: rule__XTryCatchFinallyExpression__Group_3_0_1__0
-        {
-        pushFollow(FOLLOW_2);
-        rule__XTryCatchFinallyExpression__Group_3_0_1__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred179_InternalMenuDsl
-
-    // $ANTLR start synpred180_InternalMenuDsl
-    public final void synpred180_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:15808:3: ( rule__QualifiedName__Group_1__0 )
-        // InternalMenuDsl.g:15808:3: rule__QualifiedName__Group_1__0
+        // InternalMenuDsl.g:15939:3: ( rule__QualifiedName__Group_1__0 )
+        // InternalMenuDsl.g:15939:3: rule__QualifiedName__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__QualifiedName__Group_1__0();
@@ -67174,12 +67740,12 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred180_InternalMenuDsl
+    // $ANTLR end synpred179_InternalMenuDsl
 
-    // $ANTLR start synpred182_InternalMenuDsl
-    public final void synpred182_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:16024:3: ( rule__JvmTypeReference__Group_0_1__0 )
-        // InternalMenuDsl.g:16024:3: rule__JvmTypeReference__Group_0_1__0
+    // $ANTLR start synpred181_InternalMenuDsl
+    public final void synpred181_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:16155:3: ( rule__JvmTypeReference__Group_0_1__0 )
+        // InternalMenuDsl.g:16155:3: rule__JvmTypeReference__Group_0_1__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmTypeReference__Group_0_1__0();
@@ -67189,12 +67755,12 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred182_InternalMenuDsl
+    // $ANTLR end synpred181_InternalMenuDsl
 
-    // $ANTLR start synpred186_InternalMenuDsl
-    public final void synpred186_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:16483:3: ( rule__JvmParameterizedTypeReference__Group_1__0 )
-        // InternalMenuDsl.g:16483:3: rule__JvmParameterizedTypeReference__Group_1__0
+    // $ANTLR start synpred185_InternalMenuDsl
+    public final void synpred185_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:16614:3: ( rule__JvmParameterizedTypeReference__Group_1__0 )
+        // InternalMenuDsl.g:16614:3: rule__JvmParameterizedTypeReference__Group_1__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1__0();
@@ -67204,12 +67770,12 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred186_InternalMenuDsl
+    // $ANTLR end synpred185_InternalMenuDsl
 
-    // $ANTLR start synpred188_InternalMenuDsl
-    public final void synpred188_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:16618:3: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
-        // InternalMenuDsl.g:16618:3: rule__JvmParameterizedTypeReference__Group_1_4__0
+    // $ANTLR start synpred187_InternalMenuDsl
+    public final void synpred187_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:16749:3: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
+        // InternalMenuDsl.g:16749:3: rule__JvmParameterizedTypeReference__Group_1_4__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4__0();
@@ -67219,12 +67785,12 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred188_InternalMenuDsl
+    // $ANTLR end synpred187_InternalMenuDsl
 
-    // $ANTLR start synpred189_InternalMenuDsl
-    public final void synpred189_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:16753:3: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
-        // InternalMenuDsl.g:16753:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+    // $ANTLR start synpred188_InternalMenuDsl
+    public final void synpred188_InternalMenuDsl_fragment() throws RecognitionException {   
+        // InternalMenuDsl.g:16884:3: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
+        // InternalMenuDsl.g:16884:3: rule__JvmParameterizedTypeReference__Group_1_4_2__0
         {
         pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4_2__0();
@@ -67234,15 +67800,15 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
 
         }
     }
-    // $ANTLR end synpred189_InternalMenuDsl
+    // $ANTLR end synpred188_InternalMenuDsl
 
     // Delegated rules
 
-    public final boolean synpred86_InternalMenuDsl() {
+    public final boolean synpred127_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred86_InternalMenuDsl_fragment(); // can never throw exception
+            synpred127_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67252,11 +67818,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred127_InternalMenuDsl() {
+    public final boolean synpred55_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred127_InternalMenuDsl_fragment(); // can never throw exception
+            synpred55_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67266,11 +67832,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred40_InternalMenuDsl() {
+    public final boolean synpred177_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred40_InternalMenuDsl_fragment(); // can never throw exception
+            synpred177_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67280,11 +67846,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred177_InternalMenuDsl() {
+    public final boolean synpred171_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred177_InternalMenuDsl_fragment(); // can never throw exception
+            synpred171_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67294,11 +67860,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred189_InternalMenuDsl() {
+    public final boolean synpred77_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred189_InternalMenuDsl_fragment(); // can never throw exception
+            synpred77_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67308,11 +67874,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred12_InternalMenuDsl() {
+    public final boolean synpred165_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred12_InternalMenuDsl_fragment(); // can never throw exception
+            synpred165_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67322,11 +67888,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred149_InternalMenuDsl() {
+    public final boolean synpred15_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred149_InternalMenuDsl_fragment(); // can never throw exception
+            synpred15_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67336,11 +67902,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred171_InternalMenuDsl() {
+    public final boolean synpred133_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred171_InternalMenuDsl_fragment(); // can never throw exception
+            synpred133_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67350,11 +67916,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred165_InternalMenuDsl() {
+    public final boolean synpred179_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred165_InternalMenuDsl_fragment(); // can never throw exception
+            synpred179_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67364,11 +67930,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred80_InternalMenuDsl() {
+    public final boolean synpred164_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred80_InternalMenuDsl_fragment(); // can never throw exception
+            synpred164_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67378,11 +67944,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred131_InternalMenuDsl() {
+    public final boolean synpred42_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred131_InternalMenuDsl_fragment(); // can never throw exception
+            synpred42_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67392,11 +67958,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred134_InternalMenuDsl() {
+    public final boolean synpred148_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred134_InternalMenuDsl_fragment(); // can never throw exception
+            synpred148_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67406,11 +67972,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred133_InternalMenuDsl() {
+    public final boolean synpred14_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred133_InternalMenuDsl_fragment(); // can never throw exception
+            synpred14_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67420,11 +67986,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred179_InternalMenuDsl() {
+    public final boolean synpred88_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred179_InternalMenuDsl_fragment(); // can never throw exception
+            synpred88_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67434,11 +68000,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred61_InternalMenuDsl() {
+    public final boolean synpred176_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred61_InternalMenuDsl_fragment(); // can never throw exception
+            synpred176_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67448,11 +68014,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred152_InternalMenuDsl() {
+    public final boolean synpred64_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred152_InternalMenuDsl_fragment(); // can never throw exception
+            synpred64_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67462,11 +68028,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred14_InternalMenuDsl() {
+    public final boolean synpred130_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred14_InternalMenuDsl_fragment(); // can never throw exception
+            synpred130_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67476,11 +68042,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred180_InternalMenuDsl() {
+    public final boolean synpred121_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred180_InternalMenuDsl_fragment(); // can never throw exception
+            synpred121_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67490,11 +68056,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred79_InternalMenuDsl() {
+    public final boolean synpred124_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred79_InternalMenuDsl_fragment(); // can never throw exception
+            synpred124_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67504,11 +68070,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred186_InternalMenuDsl() {
+    public final boolean synpred185_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred186_InternalMenuDsl_fragment(); // can never throw exception
+            synpred185_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67518,11 +68084,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred130_InternalMenuDsl() {
+    public final boolean synpred119_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred130_InternalMenuDsl_fragment(); // can never throw exception
+            synpred119_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67532,11 +68098,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred39_InternalMenuDsl() {
+    public final boolean synpred123_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred39_InternalMenuDsl_fragment(); // can never throw exception
+            synpred123_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67546,11 +68112,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred124_InternalMenuDsl() {
+    public final boolean synpred82_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred124_InternalMenuDsl_fragment(); // can never throw exception
+            synpred82_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67560,11 +68126,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred120_InternalMenuDsl() {
+    public final boolean synpred169_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred120_InternalMenuDsl_fragment(); // can never throw exception
+            synpred169_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67574,11 +68140,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred13_InternalMenuDsl() {
+    public final boolean synpred170_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred13_InternalMenuDsl_fragment(); // can never throw exception
+            synpred170_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67588,11 +68154,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred123_InternalMenuDsl() {
+    public final boolean synpred128_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred123_InternalMenuDsl_fragment(); // can never throw exception
+            synpred128_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67602,11 +68168,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred75_InternalMenuDsl() {
+    public final boolean synpred126_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred75_InternalMenuDsl_fragment(); // can never throw exception
+            synpred126_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67616,11 +68182,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred166_InternalMenuDsl() {
+    public final boolean synpred151_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred166_InternalMenuDsl_fragment(); // can never throw exception
+            synpred151_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67630,11 +68196,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred170_InternalMenuDsl() {
+    public final boolean synpred188_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred170_InternalMenuDsl_fragment(); // can never throw exception
+            synpred188_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67644,11 +68210,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred128_InternalMenuDsl() {
+    public final boolean synpred63_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred128_InternalMenuDsl_fragment(); // can never throw exception
+            synpred63_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67658,11 +68224,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred142_InternalMenuDsl() {
+    public final boolean synpred129_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred142_InternalMenuDsl_fragment(); // can never throw exception
+            synpred129_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67672,11 +68238,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred126_InternalMenuDsl() {
+    public final boolean synpred187_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred126_InternalMenuDsl_fragment(); // can never throw exception
+            synpred187_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67686,11 +68252,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred182_InternalMenuDsl() {
+    public final boolean synpred81_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred182_InternalMenuDsl_fragment(); // can never throw exception
+            synpred81_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67700,11 +68266,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred188_InternalMenuDsl() {
+    public final boolean synpred122_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred188_InternalMenuDsl_fragment(); // can never throw exception
+            synpred122_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67714,11 +68280,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred129_InternalMenuDsl() {
+    public final boolean synpred125_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred129_InternalMenuDsl_fragment(); // can never throw exception
+            synpred125_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67728,11 +68294,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred172_InternalMenuDsl() {
+    public final boolean synpred41_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred172_InternalMenuDsl_fragment(); // can never throw exception
+            synpred41_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67742,11 +68308,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred122_InternalMenuDsl() {
+    public final boolean synpred178_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred122_InternalMenuDsl_fragment(); // can never throw exception
+            synpred178_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67756,11 +68322,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred125_InternalMenuDsl() {
+    public final boolean synpred132_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred125_InternalMenuDsl_fragment(); // can never throw exception
+            synpred132_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67770,11 +68336,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred178_InternalMenuDsl() {
+    public final boolean synpred16_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred178_InternalMenuDsl_fragment(); // can never throw exception
+            synpred16_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67784,11 +68350,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred62_InternalMenuDsl() {
+    public final boolean synpred181_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred62_InternalMenuDsl_fragment(); // can never throw exception
+            synpred181_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67798,11 +68364,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
         state.failed=false;
         return success;
     }
-    public final boolean synpred53_InternalMenuDsl() {
+    public final boolean synpred141_InternalMenuDsl() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred53_InternalMenuDsl_fragment(); // can never throw exception
+            synpred141_InternalMenuDsl_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -67814,45 +68380,45 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     }
 
 
-    protected DFA4 dfa4 = new DFA4(this);
-    protected DFA6 dfa6 = new DFA6(this);
+    protected DFA5 dfa5 = new DFA5(this);
     protected DFA7 dfa7 = new DFA7(this);
     protected DFA8 dfa8 = new DFA8(this);
-    protected DFA15 dfa15 = new DFA15(this);
-    protected DFA23 dfa23 = new DFA23(this);
-    protected DFA26 dfa26 = new DFA26(this);
+    protected DFA9 dfa9 = new DFA9(this);
+    protected DFA16 dfa16 = new DFA16(this);
+    protected DFA24 dfa24 = new DFA24(this);
     protected DFA27 dfa27 = new DFA27(this);
-    protected DFA30 dfa30 = new DFA30(this);
-    protected DFA35 dfa35 = new DFA35(this);
-    protected DFA38 dfa38 = new DFA38(this);
-    protected DFA72 dfa72 = new DFA72(this);
-    protected DFA78 dfa78 = new DFA78(this);
-    protected DFA85 dfa85 = new DFA85(this);
-    protected DFA86 dfa86 = new DFA86(this);
-    protected DFA94 dfa94 = new DFA94(this);
-    protected DFA104 dfa104 = new DFA104(this);
-    protected DFA117 dfa117 = new DFA117(this);
-    protected DFA118 dfa118 = new DFA118(this);
+    protected DFA28 dfa28 = new DFA28(this);
+    protected DFA31 dfa31 = new DFA31(this);
+    protected DFA36 dfa36 = new DFA36(this);
+    protected DFA39 dfa39 = new DFA39(this);
+    protected DFA70 dfa70 = new DFA70(this);
+    protected DFA76 dfa76 = new DFA76(this);
+    protected DFA83 dfa83 = new DFA83(this);
+    protected DFA84 dfa84 = new DFA84(this);
+    protected DFA92 dfa92 = new DFA92(this);
+    protected DFA102 dfa102 = new DFA102(this);
+    protected DFA115 dfa115 = new DFA115(this);
+    protected DFA116 dfa116 = new DFA116(this);
+    protected DFA120 dfa120 = new DFA120(this);
+    protected DFA121 dfa121 = new DFA121(this);
     protected DFA122 dfa122 = new DFA122(this);
-    protected DFA123 dfa123 = new DFA123(this);
-    protected DFA124 dfa124 = new DFA124(this);
-    protected DFA129 dfa129 = new DFA129(this);
-    protected DFA138 dfa138 = new DFA138(this);
-    protected DFA141 dfa141 = new DFA141(this);
+    protected DFA127 dfa127 = new DFA127(this);
+    protected DFA136 dfa136 = new DFA136(this);
+    protected DFA139 dfa139 = new DFA139(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\5\1\uffff\1\53\1\uffff\1\5\1\uffff\1\53\1\uffff";
-    static final String dfa_4s = "\1\144\1\uffff\1\73\1\uffff\1\44\1\uffff\1\73\1\uffff";
+    static final String dfa_4s = "\1\146\1\uffff\1\75\1\uffff\1\44\1\uffff\1\75\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\50\uffff\1\1\65\uffff\1\3",
+            "\1\2\50\uffff\1\1\67\uffff\1\3",
             "",
-            "\1\4\3\uffff\1\5\3\uffff\1\5\7\uffff\1\5",
+            "\1\4\3\uffff\1\5\3\uffff\1\5\11\uffff\1\5",
             "",
             "\1\6\36\uffff\1\7",
             "",
-            "\1\4\3\uffff\1\5\3\uffff\1\5\7\uffff\1\5",
+            "\1\4\3\uffff\1\5\3\uffff\1\5\11\uffff\1\5",
             ""
     };
 
@@ -67864,11 +68430,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
     static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
-    class DFA4 extends DFA {
+    class DFA5 extends DFA {
 
-        public DFA4(BaseRecognizer recognizer) {
+        public DFA5(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 4;
+            this.decisionNumber = 5;
             this.eot = dfa_1;
             this.eof = dfa_2;
             this.min = dfa_3;
@@ -67878,16 +68444,16 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_7;
         }
         public String getDescription() {
-            return "2270:1: rule__XImportDeclaration__Alternatives_2 : ( ( ( rule__XImportDeclaration__Group_2_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) ) | ( ( rule__XImportDeclaration__Group_2_3__0 ) ) );";
+            return "2347:1: rule__XImportDeclaration__Alternatives_2 : ( ( ( rule__XImportDeclaration__Group_2_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_2_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_2_2 ) ) | ( ( rule__XImportDeclaration__Group_2_3__0 ) ) );";
         }
     }
     static final String dfa_8s = "\43\uffff";
     static final String dfa_9s = "\1\4\1\0\41\uffff";
-    static final String dfa_10s = "\1\151\1\0\41\uffff";
+    static final String dfa_10s = "\1\153\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\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\1\uffff\1\2\7\uffff\2\2\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\23\uffff\1\2",
+            "\1\2\1\1\3\2\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\6\uffff\1\2\4\uffff\2\2\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\23\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -67931,11 +68497,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
     static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
-    class DFA6 extends DFA {
+    class DFA7 extends DFA {
 
-        public DFA6(BaseRecognizer recognizer) {
+        public DFA7(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 6;
+            this.decisionNumber = 7;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_9;
@@ -67945,37 +68511,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_13;
         }
         public String getDescription() {
-            return "2324:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );";
+            return "2401:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA6_1 = input.LA(1);
+                        int LA7_1 = input.LA(1);
 
                          
-                        int index6_1 = input.index();
+                        int index7_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred12_InternalMenuDsl()) ) {s = 34;}
+                        if ( (synpred14_InternalMenuDsl()) ) {s = 34;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index6_1);
+                        input.seek(index7_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 6, _s, input);
+                new NoViableAltException(getDescription(), 7, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_14s = {
-            "\5\2\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\1\uffff\1\2\7\uffff\2\2\3\uffff\1\1\1\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\23\uffff\1\2",
+            "\5\2\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\6\uffff\1\2\4\uffff\2\2\3\uffff\1\1\1\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\23\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -68013,11 +68579,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     };
     static final short[][] dfa_14 = unpackEncodedStringArray(dfa_14s);
 
-    class DFA7 extends DFA {
+    class DFA8 extends DFA {
 
-        public DFA7(BaseRecognizer recognizer) {
+        public DFA8(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 7;
+            this.decisionNumber = 8;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_9;
@@ -68027,41 +68593,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_14;
         }
         public String getDescription() {
-            return "2345:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );";
+            return "2422:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA7_1 = input.LA(1);
+                        int LA8_1 = input.LA(1);
 
                          
-                        int index7_1 = input.index();
+                        int index8_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred13_InternalMenuDsl()) ) {s = 34;}
+                        if ( (synpred15_InternalMenuDsl()) ) {s = 34;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index7_1);
+                        input.seek(index8_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 7, _s, input);
+                new NoViableAltException(getDescription(), 8, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA8 extends DFA {
+    class DFA9 extends DFA {
 
-        public DFA8(BaseRecognizer recognizer) {
+        public DFA9(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 8;
+            this.decisionNumber = 9;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_9;
@@ -68071,31 +68637,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_14;
         }
         public String getDescription() {
-            return "2366:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );";
+            return "2443:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA8_1 = input.LA(1);
+                        int LA9_1 = input.LA(1);
 
                          
-                        int index8_1 = input.index();
+                        int index9_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred14_InternalMenuDsl()) ) {s = 34;}
+                        if ( (synpred16_InternalMenuDsl()) ) {s = 34;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index8_1);
+                        input.seek(index9_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 8, _s, input);
+                new NoViableAltException(getDescription(), 9, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -68126,11 +68692,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_19 = DFA.unpackEncodedString(dfa_19s);
     static final short[][] dfa_20 = unpackEncodedStringArray(dfa_20s);
 
-    class DFA15 extends DFA {
+    class DFA16 extends DFA {
 
-        public DFA15(BaseRecognizer recognizer) {
+        public DFA16(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 15;
+            this.decisionNumber = 16;
             this.eot = dfa_15;
             this.eof = dfa_15;
             this.min = dfa_16;
@@ -68140,25 +68706,25 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_20;
         }
         public String getDescription() {
-            return "2567:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );";
+            return "2644:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );";
         }
     }
     static final String dfa_21s = "\12\uffff";
     static final String dfa_22s = "\4\uffff\5\3\1\uffff";
     static final String dfa_23s = "\1\53\2\5\1\uffff\5\4\1\uffff";
-    static final String dfa_24s = "\1\146\2\61\1\uffff\5\151\1\uffff";
+    static final String dfa_24s = "\1\150\2\61\1\uffff\5\153\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\71\uffff\1\2\1\3",
+            "\1\1\73\uffff\1\2\1\3",
             "\1\4\25\uffff\1\3\21\uffff\1\5\1\6\1\7\1\10\1\3",
             "\1\4\25\uffff\1\3\21\uffff\1\5\1\6\1\7\1\10\1\3",
             "",
-            "\5\3\4\uffff\1\11\45\3\1\uffff\1\3\2\uffff\1\3\3\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\45\3\1\uffff\1\3\2\uffff\1\3\3\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\45\3\1\uffff\1\3\2\uffff\1\3\3\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\45\3\1\uffff\1\3\2\uffff\1\3\3\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\45\3\1\uffff\1\3\2\uffff\1\3\3\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\45\3\6\uffff\2\3\2\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\45\3\6\uffff\2\3\2\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\45\3\6\uffff\2\3\2\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\45\3\6\uffff\2\3\2\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\45\3\6\uffff\2\3\2\uffff\1\3\1\uffff\32\3\16\uffff\2\3\1\uffff\2\3",
             ""
     };
 
@@ -68170,11 +68736,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_26 = DFA.unpackEncodedString(dfa_26s);
     static final short[][] dfa_27 = unpackEncodedStringArray(dfa_27s);
 
-    class DFA23 extends DFA {
+    class DFA24 extends DFA {
 
-        public DFA23(BaseRecognizer recognizer) {
+        public DFA24(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 23;
+            this.decisionNumber = 24;
             this.eot = dfa_21;
             this.eof = dfa_22;
             this.min = dfa_23;
@@ -68184,15 +68750,15 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_27;
         }
         public String getDescription() {
-            return "2801:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );";
+            return "2878:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );";
         }
     }
     static final String dfa_28s = "\1\4\2\0\40\uffff";
-    static final String dfa_29s = "\1\151\2\0\40\uffff";
+    static final String dfa_29s = "\1\153\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\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4\uffff\6\5\1\uffff\1\5\10\uffff\1\2\3\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\21\uffff\1\3\1\uffff\1\5",
+            "\1\5\1\1\3\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4\uffff\6\5\6\uffff\1\5\5\uffff\1\2\3\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\21\uffff\1\3\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -68234,11 +68800,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_31 = DFA.unpackEncodedString(dfa_31s);
     static final short[][] dfa_32 = unpackEncodedStringArray(dfa_32s);
 
-    class DFA26 extends DFA {
+    class DFA27 extends DFA {
 
-        public DFA26(BaseRecognizer recognizer) {
+        public DFA27(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 26;
+            this.decisionNumber = 27;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_28;
@@ -68248,57 +68814,57 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_32;
         }
         public String getDescription() {
-            return "2870:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );";
+            return "2947:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA26_1 = input.LA(1);
+                        int LA27_1 = input.LA(1);
 
                          
-                        int index26_1 = input.index();
+                        int index27_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred53_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred55_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index26_1);
+                        input.seek(index27_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA26_2 = input.LA(1);
+                        int LA27_2 = input.LA(1);
 
                          
-                        int index26_2 = input.index();
+                        int index27_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred53_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred55_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index26_2);
+                        input.seek(index27_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 26, _s, input);
+                new NoViableAltException(getDescription(), 27, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     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\151\26\uffff\1\0\10\uffff";
+    static final String dfa_35s = "\1\153\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\22\uffff\1\5\21\uffff\5\5\1\14\1\uffff\1\2\10\uffff\1\35\3\uffff\2\14\2\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\23\uffff\1\14",
+            "\1\14\1\5\3\14\22\uffff\1\5\21\uffff\5\5\1\14\6\uffff\1\2\5\uffff\1\35\3\uffff\2\14\2\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\23\uffff\1\14",
             "",
             "",
             "",
@@ -68339,11 +68905,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_37 = DFA.unpackEncodedString(dfa_37s);
     static final short[][] dfa_38 = unpackEncodedStringArray(dfa_38s);
 
-    class DFA27 extends DFA {
+    class DFA28 extends DFA {
 
-        public DFA27(BaseRecognizer recognizer) {
+        public DFA28(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 27;
+            this.decisionNumber = 28;
             this.eot = dfa_33;
             this.eof = dfa_33;
             this.min = dfa_34;
@@ -68353,37 +68919,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_38;
         }
         public String getDescription() {
-            return "2891:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );";
+            return "2968:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA27_23 = input.LA(1);
+                        int LA28_23 = input.LA(1);
 
                          
-                        int index27_23 = input.index();
+                        int index28_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred61_InternalMenuDsl()) ) {s = 30;}
+                        if ( (synpred63_InternalMenuDsl()) ) {s = 30;}
 
-                        else if ( (synpred62_InternalMenuDsl()) ) {s = 31;}
+                        else if ( (synpred64_InternalMenuDsl()) ) {s = 31;}
 
                          
-                        input.seek(index27_23);
+                        input.seek(index28_23);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 27, _s, input);
+                new NoViableAltException(getDescription(), 28, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_39s = {
-            "\5\2\22\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\4\uffff\6\2\1\uffff\1\2\10\uffff\1\1\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\23\uffff\1\2",
+            "\5\2\22\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\4\uffff\6\2\6\uffff\1\2\5\uffff\1\1\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\23\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -68421,11 +68987,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     };
     static final short[][] dfa_39 = unpackEncodedStringArray(dfa_39s);
 
-    class DFA30 extends DFA {
+    class DFA31 extends DFA {
 
-        public DFA30(BaseRecognizer recognizer) {
+        public DFA31(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 30;
+            this.decisionNumber = 31;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_9;
@@ -68435,41 +69001,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_39;
         }
         public String getDescription() {
-            return "3062:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );";
+            return "3139:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA30_1 = input.LA(1);
+                        int LA31_1 = input.LA(1);
 
                          
-                        int index30_1 = input.index();
+                        int index31_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred75_InternalMenuDsl()) ) {s = 34;}
+                        if ( (synpred77_InternalMenuDsl()) ) {s = 34;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index30_1);
+                        input.seek(index31_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 30, _s, input);
+                new NoViableAltException(getDescription(), 31, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA35 extends DFA {
+    class DFA36 extends DFA {
 
-        public DFA35(BaseRecognizer recognizer) {
+        public DFA36(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 35;
+            this.decisionNumber = 36;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_28;
@@ -68479,56 +69045,56 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_32;
         }
         public String getDescription() {
-            return "3167:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );";
+            return "3244:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA35_1 = input.LA(1);
+                        int LA36_1 = input.LA(1);
 
                          
-                        int index35_1 = input.index();
+                        int index36_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred80_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred82_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index35_1);
+                        input.seek(index36_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA35_2 = input.LA(1);
+                        int LA36_2 = input.LA(1);
 
                          
-                        int index35_2 = input.index();
+                        int index36_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred80_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred82_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index35_2);
+                        input.seek(index36_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 35, _s, input);
+                new NoViableAltException(getDescription(), 36, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA38 extends DFA {
+    class DFA39 extends DFA {
 
-        public DFA38(BaseRecognizer recognizer) {
+        public DFA39(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 38;
+            this.decisionNumber = 39;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_28;
@@ -68538,57 +69104,57 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_32;
         }
         public String getDescription() {
-            return "3248:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );";
+            return "3325:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA38_1 = input.LA(1);
+                        int LA39_1 = input.LA(1);
 
                          
-                        int index38_1 = input.index();
+                        int index39_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred86_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred88_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index38_1);
+                        input.seek(index39_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA38_2 = input.LA(1);
+                        int LA39_2 = input.LA(1);
 
                          
-                        int index38_2 = input.index();
+                        int index39_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred86_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred88_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index38_2);
+                        input.seek(index39_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 38, _s, input);
+                new NoViableAltException(getDescription(), 39, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     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\151\7\0\2\uffff";
+    static final String dfa_42s = "\1\153\7\0\2\uffff";
     static final String dfa_43s = "\10\uffff\1\2\1\1";
-    static final String dfa_44s = "\1\uffff\1\0\1\6\1\5\1\2\1\1\1\4\1\3\2\uffff}>";
+    static final String dfa_44s = "\1\uffff\1\3\1\6\1\0\1\2\1\4\1\1\1\5\2\uffff}>";
     static final String[] dfa_45s = {
-            "\5\10\5\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\27\10\1\uffff\1\10\2\uffff\1\10\3\uffff\1\10\1\uffff\32\10\16\uffff\2\10\1\uffff\2\10",
+            "\5\10\5\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\27\10\6\uffff\2\10\2\uffff\1\10\1\uffff\32\10\16\uffff\2\10\1\uffff\2\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -68606,11 +69172,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
     static final short[][] dfa_45 = unpackEncodedStringArray(dfa_45s);
 
-    class DFA72 extends DFA {
+    class DFA70 extends DFA {
 
-        public DFA72(BaseRecognizer recognizer) {
+        public DFA70(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 72;
+            this.decisionNumber = 70;
             this.eot = dfa_21;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -68620,132 +69186,132 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "6243:2: ( rule__XAssignment__Group_1_1__0 )?";
+            return "6374: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 LA72_1 = input.LA(1);
+                        int LA70_3 = input.LA(1);
 
                          
-                        int index72_1 = input.index();
+                        int index70_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred120_InternalMenuDsl()) ) {s = 9;}
+                        if ( (synpred119_InternalMenuDsl()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index72_1);
+                        input.seek(index70_3);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA72_5 = input.LA(1);
+                        int LA70_6 = input.LA(1);
 
                          
-                        int index72_5 = input.index();
+                        int index70_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred120_InternalMenuDsl()) ) {s = 9;}
+                        if ( (synpred119_InternalMenuDsl()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index72_5);
+                        input.seek(index70_6);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA72_4 = input.LA(1);
+                        int LA70_4 = input.LA(1);
 
                          
-                        int index72_4 = input.index();
+                        int index70_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred120_InternalMenuDsl()) ) {s = 9;}
+                        if ( (synpred119_InternalMenuDsl()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index72_4);
+                        input.seek(index70_4);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA72_7 = input.LA(1);
+                        int LA70_1 = input.LA(1);
 
                          
-                        int index72_7 = input.index();
+                        int index70_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred120_InternalMenuDsl()) ) {s = 9;}
+                        if ( (synpred119_InternalMenuDsl()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index72_7);
+                        input.seek(index70_1);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA72_6 = input.LA(1);
+                        int LA70_5 = input.LA(1);
 
                          
-                        int index72_6 = input.index();
+                        int index70_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred120_InternalMenuDsl()) ) {s = 9;}
+                        if ( (synpred119_InternalMenuDsl()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index72_6);
+                        input.seek(index70_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA72_3 = input.LA(1);
+                        int LA70_7 = input.LA(1);
 
                          
-                        int index72_3 = input.index();
+                        int index70_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred120_InternalMenuDsl()) ) {s = 9;}
+                        if ( (synpred119_InternalMenuDsl()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index72_3);
+                        input.seek(index70_7);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA72_2 = input.LA(1);
+                        int LA70_2 = input.LA(1);
 
                          
-                        int index72_2 = input.index();
+                        int index70_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred120_InternalMenuDsl()) ) {s = 9;}
+                        if ( (synpred119_InternalMenuDsl()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index72_2);
+                        input.seek(index70_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 72, _s, input);
+                new NoViableAltException(getDescription(), 70, _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\151\1\uffff\10\0\1\uffff";
+    static final String dfa_48s = "\1\153\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\4\1\1\1\5\1\7\1\0\1\3\1\6\1\uffff}>";
+    static final String dfa_50s = "\2\uffff\1\2\1\6\1\7\1\4\1\3\1\1\1\0\1\5\1\uffff}>";
     static final String[] dfa_51s = {
-            "\5\1\5\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\21\1\1\uffff\1\1\2\uffff\1\1\3\uffff\1\1\1\uffff\32\1\16\uffff\2\1\1\uffff\2\1",
+            "\5\1\5\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\21\1\6\uffff\2\1\2\uffff\1\1\1\uffff\32\1\16\uffff\2\1\1\uffff\2\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -68764,11 +69330,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_50 = DFA.unpackEncodedString(dfa_50s);
     static final short[][] dfa_51 = unpackEncodedStringArray(dfa_51s);
 
-    class DFA78 extends DFA {
+    class DFA76 extends DFA {
 
-        public DFA78(BaseRecognizer recognizer) {
+        public DFA76(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 78;
+            this.decisionNumber = 76;
             this.eot = dfa_15;
             this.eof = dfa_46;
             this.min = dfa_47;
@@ -68778,136 +69344,136 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "()* loopback of 7539:2: ( rule__XOtherOperatorExpression__Group_1__0 )*";
+            return "()* loopback of 7670: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 LA78_7 = input.LA(1);
+                        int LA76_8 = input.LA(1);
 
                          
-                        int index78_7 = input.index();
+                        int index76_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_7);
+                        input.seek(index76_8);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA78_4 = input.LA(1);
+                        int LA76_7 = input.LA(1);
 
                          
-                        int index78_4 = input.index();
+                        int index76_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_4);
+                        input.seek(index76_7);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA78_2 = input.LA(1);
+                        int LA76_2 = input.LA(1);
 
                          
-                        int index78_2 = input.index();
+                        int index76_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_2);
+                        input.seek(index76_2);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA78_8 = input.LA(1);
+                        int LA76_6 = input.LA(1);
 
                          
-                        int index78_8 = input.index();
+                        int index76_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_8);
+                        input.seek(index76_6);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA78_3 = input.LA(1);
+                        int LA76_5 = input.LA(1);
 
                          
-                        int index78_3 = input.index();
+                        int index76_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_3);
+                        input.seek(index76_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA78_5 = input.LA(1);
+                        int LA76_9 = input.LA(1);
 
                          
-                        int index78_5 = input.index();
+                        int index76_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_5);
+                        input.seek(index76_9);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA78_9 = input.LA(1);
+                        int LA76_3 = input.LA(1);
 
                          
-                        int index78_9 = input.index();
+                        int index76_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_9);
+                        input.seek(index76_3);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA78_6 = input.LA(1);
+                        int LA76_4 = input.LA(1);
 
                          
-                        int index78_6 = input.index();
+                        int index76_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred126_InternalMenuDsl()) ) {s = 10;}
+                        if ( (synpred125_InternalMenuDsl()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index78_6);
+                        input.seek(index76_4);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 78, _s, input);
+                new NoViableAltException(getDescription(), 76, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -68915,11 +69481,11 @@ public class InternalMenuDslParser 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\151\1\0\114\uffff";
+    static final String dfa_55s = "\1\153\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\5\uffff\45\2\1\uffff\1\2\2\uffff\1\2\3\uffff\1\2\1\uffff\1\1\31\2\16\uffff\2\2\1\uffff\2\2",
+            "\5\2\5\uffff\45\2\6\uffff\2\2\2\uffff\1\2\1\uffff\1\1\31\2\16\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -69007,11 +69573,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_57 = DFA.unpackEncodedString(dfa_57s);
     static final short[][] dfa_58 = unpackEncodedStringArray(dfa_58s);
 
-    class DFA85 extends DFA {
+    class DFA83 extends DFA {
 
-        public DFA85(BaseRecognizer recognizer) {
+        public DFA83(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 85;
+            this.decisionNumber = 83;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -69021,37 +69587,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_58;
         }
         public String getDescription() {
-            return "9133:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
+            return "9264: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 LA85_1 = input.LA(1);
+                        int LA83_1 = input.LA(1);
 
                          
-                        int index85_1 = input.index();
+                        int index83_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred133_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred132_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index85_1);
+                        input.seek(index83_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 85, _s, input);
+                new NoViableAltException(getDescription(), 83, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_59s = {
-            "\5\2\5\uffff\45\2\1\uffff\1\2\2\uffff\1\2\3\uffff\1\2\1\uffff\5\2\1\1\24\2\16\uffff\2\2\1\uffff\2\2",
+            "\5\2\5\uffff\45\2\6\uffff\2\2\2\uffff\1\2\1\uffff\5\2\1\1\24\2\16\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -69132,11 +69698,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     };
     static final short[][] dfa_59 = unpackEncodedStringArray(dfa_59s);
 
-    class DFA86 extends DFA {
+    class DFA84 extends DFA {
 
-        public DFA86(BaseRecognizer recognizer) {
+        public DFA84(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 86;
+            this.decisionNumber = 84;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -69146,42 +69712,42 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_59;
         }
         public String getDescription() {
-            return "9159:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
+            return "9290: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 LA86_1 = input.LA(1);
+                        int LA84_1 = input.LA(1);
 
                          
-                        int index86_1 = input.index();
+                        int index84_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred134_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred133_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index86_1);
+                        input.seek(index84_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 86, _s, input);
+                new NoViableAltException(getDescription(), 84, _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\151\2\0\43\uffff";
+    static final String dfa_62s = "\1\153\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\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\3\uffff\7\5\1\uffff\1\5\10\uffff\1\2\2\uffff\3\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\21\uffff\1\3\2\5",
+            "\1\5\1\1\3\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\3\uffff\7\5\6\uffff\1\5\5\uffff\1\2\2\uffff\3\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\21\uffff\1\3\2\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -69228,11 +69794,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_64 = DFA.unpackEncodedString(dfa_64s);
     static final short[][] dfa_65 = unpackEncodedStringArray(dfa_65s);
 
-    class DFA94 extends DFA {
+    class DFA92 extends DFA {
 
-        public DFA94(BaseRecognizer recognizer) {
+        public DFA92(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 94;
+            this.decisionNumber = 92;
             this.eot = dfa_60;
             this.eof = dfa_60;
             this.min = dfa_61;
@@ -69242,57 +69808,57 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_65;
         }
         public String getDescription() {
-            return "10132:2: ( rule__XClosure__Group_1__0 )?";
+            return "10263: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 LA94_1 = input.LA(1);
+                        int LA92_1 = input.LA(1);
 
                          
-                        int index94_1 = input.index();
+                        int index92_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred142_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred141_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index94_1);
+                        input.seek(index92_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA94_2 = input.LA(1);
+                        int LA92_2 = input.LA(1);
 
                          
-                        int index94_2 = input.index();
+                        int index92_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred142_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred141_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index94_2);
+                        input.seek(index92_2);
                         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(), 92, _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\151\2\0\37\uffff";
+    static final String dfa_68s = "\1\153\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\22\uffff\1\4\3\uffff\1\3\2\uffff\2\4\4\uffff\1\4\4\uffff\6\4\1\uffff\1\4\10\uffff\1\2\3\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\11\4\1\uffff\1\4\23\uffff\1\4",
+            "\1\4\1\1\3\4\22\uffff\1\4\3\uffff\1\3\2\uffff\2\4\4\uffff\1\4\4\uffff\6\4\6\uffff\1\4\5\uffff\1\2\3\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\11\4\1\uffff\1\4\23\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -69335,11 +69901,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_70 = DFA.unpackEncodedString(dfa_70s);
     static final short[][] dfa_71 = unpackEncodedStringArray(dfa_71s);
 
-    class DFA104 extends DFA {
+    class DFA102 extends DFA {
 
-        public DFA104(BaseRecognizer recognizer) {
+        public DFA102(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 104;
+            this.decisionNumber = 102;
             this.eot = dfa_66;
             this.eof = dfa_66;
             this.min = dfa_67;
@@ -69349,56 +69915,56 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_71;
         }
         public String getDescription() {
-            return "11563:2: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
+            return "11694: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 LA104_1 = input.LA(1);
+                        int LA102_1 = input.LA(1);
 
                          
-                        int index104_1 = input.index();
+                        int index102_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred152_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred151_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index104_1);
+                        input.seek(index102_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA104_2 = input.LA(1);
+                        int LA102_2 = input.LA(1);
 
                          
-                        int index104_2 = input.index();
+                        int index102_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred152_InternalMenuDsl()) ) {s = 3;}
+                        if ( (synpred151_InternalMenuDsl()) ) {s = 3;}
 
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index104_2);
+                        input.seek(index102_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 104, _s, input);
+                new NoViableAltException(getDescription(), 102, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA117 extends DFA {
+    class DFA115 extends DFA {
 
-        public DFA117(BaseRecognizer recognizer) {
+        public DFA115(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 117;
+            this.decisionNumber = 115;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -69408,41 +69974,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_58;
         }
         public String getDescription() {
-            return "13696:2: ( rule__XFeatureCall__Group_3__0 )?";
+            return "13827: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 LA117_1 = input.LA(1);
+                        int LA115_1 = input.LA(1);
 
                          
-                        int index117_1 = input.index();
+                        int index115_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred165_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred164_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index117_1);
+                        input.seek(index115_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 117, _s, input);
+                new NoViableAltException(getDescription(), 115, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA118 extends DFA {
+    class DFA116 extends DFA {
 
-        public DFA118(BaseRecognizer recognizer) {
+        public DFA116(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 118;
+            this.decisionNumber = 116;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -69452,37 +70018,37 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_59;
         }
         public String getDescription() {
-            return "13722:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
+            return "13853: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 LA118_1 = input.LA(1);
+                        int LA116_1 = input.LA(1);
 
                          
-                        int index118_1 = input.index();
+                        int index116_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred165_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index118_1);
+                        input.seek(index116_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 118, _s, input);
+                new NoViableAltException(getDescription(), 116, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_72s = {
-            "\5\2\5\uffff\15\2\1\1\27\2\1\uffff\1\2\2\uffff\1\2\3\uffff\1\2\1\uffff\32\2\16\uffff\2\2\1\uffff\2\2",
+            "\5\2\5\uffff\15\2\1\1\27\2\6\uffff\2\2\2\uffff\1\2\1\uffff\32\2\16\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -69563,11 +70129,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     };
     static final short[][] dfa_72 = unpackEncodedStringArray(dfa_72s);
 
-    class DFA122 extends DFA {
+    class DFA120 extends DFA {
 
-        public DFA122(BaseRecognizer recognizer) {
+        public DFA120(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 122;
+            this.decisionNumber = 120;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -69577,41 +70143,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_72;
         }
         public String getDescription() {
-            return "14182:2: ( rule__XConstructorCall__Group_3__0 )?";
+            return "14313: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 LA122_1 = input.LA(1);
+                        int LA120_1 = input.LA(1);
 
                          
-                        int index122_1 = input.index();
+                        int index120_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred170_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred169_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index122_1);
+                        input.seek(index120_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 122, _s, input);
+                new NoViableAltException(getDescription(), 120, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    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_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -69621,41 +70187,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_58;
         }
         public String getDescription() {
-            return "14209:2: ( rule__XConstructorCall__Group_4__0 )?";
+            return "14340: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 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 ( (synpred171_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred170_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index123_1);
+                        input.seek(index121_1);
                         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;
         }
     }
 
-    class DFA124 extends DFA {
+    class DFA122 extends DFA {
 
-        public DFA124(BaseRecognizer recognizer) {
+        public DFA122(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 124;
+            this.decisionNumber = 122;
             this.eot = dfa_52;
             this.eof = dfa_53;
             this.min = dfa_54;
@@ -69665,42 +70231,42 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_59;
         }
         public String getDescription() {
-            return "14235:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
+            return "14366: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 LA124_1 = input.LA(1);
+                        int LA122_1 = input.LA(1);
 
                          
-                        int index124_1 = input.index();
+                        int index122_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred172_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred171_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index124_1);
+                        input.seek(index122_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 124, _s, input);
+                new NoViableAltException(getDescription(), 122, _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\151\40\0\55\uffff";
+    static final String dfa_75s = "\1\153\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\5\uffff\15\41\1\15\6\41\1\10\1\7\4\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\1\uffff\1\12\2\uffff\1\41\3\uffff\1\41\1\uffff\1\40\3\41\1\17\1\20\2\41\1\31\1\41\1\13\3\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\16\uffff\2\41\1\uffff\1\41\1\22",
+            "\1\27\1\1\1\23\1\24\1\25\5\uffff\15\41\1\15\6\41\1\10\1\7\4\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\6\uffff\1\12\1\41\2\uffff\1\41\1\uffff\1\40\3\41\1\17\1\20\2\41\1\31\1\41\1\13\3\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\16\uffff\2\41\1\uffff\1\41\1\22",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -69786,11 +70352,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_77 = DFA.unpackEncodedString(dfa_77s);
     static final short[][] dfa_78 = unpackEncodedStringArray(dfa_78s);
 
-    class DFA129 extends DFA {
+    class DFA127 extends DFA {
 
-        public DFA129(BaseRecognizer recognizer) {
+        public DFA127(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 129;
+            this.decisionNumber = 127;
             this.eot = dfa_52;
             this.eof = dfa_73;
             this.min = dfa_74;
@@ -69800,496 +70366,496 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_78;
         }
         public String getDescription() {
-            return "15126:2: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
+            return "15257: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 LA129_1 = input.LA(1);
+                        int LA127_1 = input.LA(1);
 
                          
-                        int index129_1 = input.index();
+                        int index127_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_1);
+                        input.seek(index127_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA129_2 = input.LA(1);
+                        int LA127_2 = input.LA(1);
 
                          
-                        int index129_2 = input.index();
+                        int index127_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_2);
+                        input.seek(index127_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA129_3 = input.LA(1);
+                        int LA127_3 = input.LA(1);
 
                          
-                        int index129_3 = input.index();
+                        int index127_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_3);
+                        input.seek(index127_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA129_4 = input.LA(1);
+                        int LA127_4 = input.LA(1);
 
                          
-                        int index129_4 = input.index();
+                        int index127_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_4);
+                        input.seek(index127_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA129_5 = input.LA(1);
+                        int LA127_5 = input.LA(1);
 
                          
-                        int index129_5 = input.index();
+                        int index127_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_5);
+                        input.seek(index127_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA129_6 = input.LA(1);
+                        int LA127_6 = input.LA(1);
 
                          
-                        int index129_6 = input.index();
+                        int index127_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_6);
+                        input.seek(index127_6);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA129_7 = input.LA(1);
+                        int LA127_7 = input.LA(1);
 
                          
-                        int index129_7 = input.index();
+                        int index127_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_7);
+                        input.seek(index127_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA129_8 = input.LA(1);
+                        int LA127_8 = input.LA(1);
 
                          
-                        int index129_8 = input.index();
+                        int index127_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_8);
+                        input.seek(index127_8);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA129_9 = input.LA(1);
+                        int LA127_9 = input.LA(1);
 
                          
-                        int index129_9 = input.index();
+                        int index127_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_9);
+                        input.seek(index127_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA129_10 = input.LA(1);
+                        int LA127_10 = input.LA(1);
 
                          
-                        int index129_10 = input.index();
+                        int index127_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_10);
+                        input.seek(index127_10);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA129_11 = input.LA(1);
+                        int LA127_11 = input.LA(1);
 
                          
-                        int index129_11 = input.index();
+                        int index127_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_11);
+                        input.seek(index127_11);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA129_12 = input.LA(1);
+                        int LA127_12 = input.LA(1);
 
                          
-                        int index129_12 = input.index();
+                        int index127_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_12);
+                        input.seek(index127_12);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA129_13 = input.LA(1);
+                        int LA127_13 = input.LA(1);
 
                          
-                        int index129_13 = input.index();
+                        int index127_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_13);
+                        input.seek(index127_13);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA129_14 = input.LA(1);
+                        int LA127_14 = input.LA(1);
 
                          
-                        int index129_14 = input.index();
+                        int index127_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_14);
+                        input.seek(index127_14);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA129_15 = input.LA(1);
+                        int LA127_15 = input.LA(1);
 
                          
-                        int index129_15 = input.index();
+                        int index127_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_15);
+                        input.seek(index127_15);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA129_16 = input.LA(1);
+                        int LA127_16 = input.LA(1);
 
                          
-                        int index129_16 = input.index();
+                        int index127_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_16);
+                        input.seek(index127_16);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA129_17 = input.LA(1);
+                        int LA127_17 = input.LA(1);
 
                          
-                        int index129_17 = input.index();
+                        int index127_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_17);
+                        input.seek(index127_17);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA129_18 = input.LA(1);
+                        int LA127_18 = input.LA(1);
 
                          
-                        int index129_18 = input.index();
+                        int index127_18 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_18);
+                        input.seek(index127_18);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA129_19 = input.LA(1);
+                        int LA127_19 = input.LA(1);
 
                          
-                        int index129_19 = input.index();
+                        int index127_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_19);
+                        input.seek(index127_19);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA129_20 = input.LA(1);
+                        int LA127_20 = input.LA(1);
 
                          
-                        int index129_20 = input.index();
+                        int index127_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_20);
+                        input.seek(index127_20);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA129_21 = input.LA(1);
+                        int LA127_21 = input.LA(1);
 
                          
-                        int index129_21 = input.index();
+                        int index127_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_21);
+                        input.seek(index127_21);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA129_22 = input.LA(1);
+                        int LA127_22 = input.LA(1);
 
                          
-                        int index129_22 = input.index();
+                        int index127_22 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_22);
+                        input.seek(index127_22);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA129_23 = input.LA(1);
+                        int LA127_23 = input.LA(1);
 
                          
-                        int index129_23 = input.index();
+                        int index127_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_23);
+                        input.seek(index127_23);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA129_24 = input.LA(1);
+                        int LA127_24 = input.LA(1);
 
                          
-                        int index129_24 = input.index();
+                        int index127_24 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_24);
+                        input.seek(index127_24);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA129_25 = input.LA(1);
+                        int LA127_25 = input.LA(1);
 
                          
-                        int index129_25 = input.index();
+                        int index127_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_25);
+                        input.seek(index127_25);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA129_26 = input.LA(1);
+                        int LA127_26 = input.LA(1);
 
                          
-                        int index129_26 = input.index();
+                        int index127_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_26);
+                        input.seek(index127_26);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA129_27 = input.LA(1);
+                        int LA127_27 = input.LA(1);
 
                          
-                        int index129_27 = input.index();
+                        int index127_27 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_27);
+                        input.seek(index127_27);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA129_28 = input.LA(1);
+                        int LA127_28 = input.LA(1);
 
                          
-                        int index129_28 = input.index();
+                        int index127_28 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_28);
+                        input.seek(index127_28);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA129_29 = input.LA(1);
+                        int LA127_29 = input.LA(1);
 
                          
-                        int index129_29 = input.index();
+                        int index127_29 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_29);
+                        input.seek(index127_29);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA129_30 = input.LA(1);
+                        int LA127_30 = input.LA(1);
 
                          
-                        int index129_30 = input.index();
+                        int index127_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_30);
+                        input.seek(index127_30);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA129_31 = input.LA(1);
+                        int LA127_31 = input.LA(1);
 
                          
-                        int index129_31 = input.index();
+                        int index127_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_31);
+                        input.seek(index127_31);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA129_32 = input.LA(1);
+                        int LA127_32 = input.LA(1);
 
                          
-                        int index129_32 = input.index();
+                        int index127_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred177_InternalMenuDsl()) ) {s = 77;}
+                        if ( (synpred176_InternalMenuDsl()) ) {s = 77;}
 
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index129_32);
+                        input.seek(index127_32);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 129, _s, input);
+                new NoViableAltException(getDescription(), 127, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -70297,11 +70863,11 @@ public class InternalMenuDslParser 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\151\1\0\115\uffff";
+    static final String dfa_82s = "\1\153\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\5\uffff\15\2\1\1\27\2\1\uffff\1\2\2\uffff\1\2\3\uffff\1\2\1\uffff\32\2\1\uffff\1\2\14\uffff\2\2\1\uffff\2\2",
+            "\5\2\5\uffff\15\2\1\1\27\2\6\uffff\2\2\2\uffff\1\2\1\uffff\32\2\1\uffff\1\2\14\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -70390,11 +70956,11 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_84 = DFA.unpackEncodedString(dfa_84s);
     static final short[][] dfa_85 = unpackEncodedStringArray(dfa_85s);
 
-    class DFA138 extends DFA {
+    class DFA136 extends DFA {
 
-        public DFA138(BaseRecognizer recognizer) {
+        public DFA136(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 138;
+            this.decisionNumber = 136;
             this.eot = dfa_79;
             this.eof = dfa_80;
             this.min = dfa_81;
@@ -70404,41 +70970,41 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_85;
         }
         public String getDescription() {
-            return "16483:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
+            return "16614: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 LA138_1 = input.LA(1);
+                        int LA136_1 = input.LA(1);
 
                          
-                        int index138_1 = input.index();
+                        int index136_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred186_InternalMenuDsl()) ) {s = 78;}
+                        if ( (synpred185_InternalMenuDsl()) ) {s = 78;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index138_1);
+                        input.seek(index136_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 138, _s, input);
+                new NoViableAltException(getDescription(), 136, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA141 extends DFA {
+    class DFA139 extends DFA {
 
-        public DFA141(BaseRecognizer recognizer) {
+        public DFA139(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 141;
+            this.decisionNumber = 139;
             this.eot = dfa_79;
             this.eof = dfa_80;
             this.min = dfa_81;
@@ -70448,31 +71014,31 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_85;
         }
         public String getDescription() {
-            return "16753:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
+            return "16884: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 LA141_1 = input.LA(1);
+                        int LA139_1 = input.LA(1);
 
                          
-                        int index141_1 = input.index();
+                        int index139_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred189_InternalMenuDsl()) ) {s = 78;}
+                        if ( (synpred188_InternalMenuDsl()) ) {s = 78;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index141_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(), 141, _s, input);
+                new NoViableAltException(getDescription(), 139, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -70484,111 +71050,114 @@ public class InternalMenuDslParser extends AbstractInternalContentAssistParser {
     public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000800000000002L});
     public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000022L});
     public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000010L});
     public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0780000000000000L,0x0000000006000000L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0400000000000002L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0010000000000000L,0x0000000FF8000000L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0480000000000000L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000400000000020L,0x0000001000000000L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0001000000000020L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000001000000020L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x7017E10C080001F0L,0x00000200002FF8A6L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x01C0000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0100000000000002L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0200000000000000L,0x00000003F0000000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0C00000000000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0800000000000002L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0200000000000000L,0x0000000400000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x1400000000000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000000L,0x0000003800000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000400000000020L,0x0000004000000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0001000000000020L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000001000000020L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x4000000000000000L});
     public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x3017E10C080001F0L,0x00000200002FF8A6L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x3017E10C080001F0L,0x00000200002FF8A7L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0001E00000000020L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x000000000C1F0000L});
-    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000001E00000L});
-    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000001E00002L});
-    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x000000000E000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x000000000E000002L,0x0000000000000008L});
-    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x2000000080000020L});
-    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x00000003FC000000L});
-    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x00000003FC000002L});
-    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000088000000L});
-    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000C00000000L});
-    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000C00000002L});
-    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x000000F000000000L});
-    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x000000F000000002L});
-    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000010C00000000L});
-    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000060000000000L});
-    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000080000000000L,0x0000006000000000L});
-    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000080000000002L,0x0000006000000000L});
-    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000080000000000L,0x0000002000000000L});
-    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0003E00008000020L});
-    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x2000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x2000000080000020L,0x0000000000800000L});
-    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x8000000004000000L});
-    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x7017E10C880001F0L,0x00000280002FF8A6L});
-    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x3097E10C080001F0L,0x00000200002FF8A6L});
-    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x3017F10C880001F0L,0x00000380002FF8A6L});
-    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x2000000080000020L,0x0000008000000000L});
-    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x3017F10C080001F2L,0x00000300002FF8A6L});
-    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x3017E10C880001F0L,0x00000200002FF8A6L});
-    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0xA080000080000020L,0x0000000000000700L});
-    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0xA000000080000022L,0x0000000000000500L});
-    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0xA000000080000020L,0x0000000000000500L});
-    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x3817F10C080001F0L,0x00000300002FF8A6L});
-    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x3817E10C080001F0L,0x00000200002FF8A6L});
-    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x3017F10C080001F0L,0x00000300002FF8A6L});
-    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x3097F10C080001F0L,0x00000300002FF8A6L});
-    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000100000000000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x2000000008000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0004000000000000L,0x0000020000000000L});
-    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x00000000000001C0L});
-    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x00040000000001D0L,0x0000020000018006L});
-    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x4000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000000000L,0x0000000000500000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0xC207E10C080001F0L,0x0000080000BFE299L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000002L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0xC207E10C080001F0L,0x0000080000BFE298L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0xC207E10C080001F0L,0x0000080000BFE29CL});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0001E00000000020L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x000000000C1F0000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000006000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000004002L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000001E00000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000001E00002L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x000000000E000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x000000000E000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x8000000080000020L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x00000003FC000000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x00000003FC000002L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000088000000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000C00000000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000C00000002L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x000000F000000000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x000000F000000002L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000010C00000000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000040L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000060000000000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000080000000000L,0x0000018000000000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000080000000002L,0x0000018000000000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000080000000000L,0x0000008000000000L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0003E00008000020L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x8000000080000020L,0x0000000002000000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0xC207E10C880001F0L,0x00000A0000BFE299L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0xC607E10C080001F0L,0x0000080000BFE298L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0xC207F10C880001F0L,0x00000E0000BFE298L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x8000000080000020L,0x0000020000000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0xC207F10C080001F2L,0x00000C0000BFE298L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0xC207E10C880001F0L,0x0000080000BFE298L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x8400000080000020L,0x0000000000001C02L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x8000000080000022L,0x0000000000001402L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x8000000080000020L,0x0000000000001402L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0xE207F10C080001F0L,0x00000C0000BFE298L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0xE207E10C080001F0L,0x0000080000BFE298L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0xC207F10C080001F0L,0x00000C0000BFE298L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0xC607F10C080001F0L,0x00000C0000BFE298L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000100000000000L,0x0000040000000000L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x8000000008000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0004000000000000L,0x0000080000000000L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x00000000000001C0L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x00040000000001D0L,0x0000080000060018L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000011L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
     public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
-    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000180L});
-    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x6000000080000020L});
-    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0002200000000000L});
-    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
-    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000000001400000L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000180L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x8000000080000020L,0x0000000000000001L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0002200000000000L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x0000001000000000L});
 
 }
 \ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.menu.tests/LICENSE.txt b/org.eclipse.osbp.xtext.menu.tests/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.menu.tests/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.menu.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.menu.tests/about.html b/org.eclipse.osbp.xtext.menu.tests/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.menu.tests/about.html
+++ b/org.eclipse.osbp.xtext.menu.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.menu.tests/about.properties b/org.eclipse.osbp.xtext.menu.tests/about.properties
index bc7b16c..9bd6fd3 100644
--- a/org.eclipse.osbp.xtext.menu.tests/about.properties
+++ b/org.eclipse.osbp.xtext.menu.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.menu.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.menu.tests/build.properties b/org.eclipse.osbp.xtext.menu.tests/build.properties
index ac27e27..ea4f6e8 100644
--- a/org.eclipse.osbp.xtext.menu.tests/build.properties
+++ b/org.eclipse.osbp.xtext.menu.tests/build.properties
@@ -4,8 +4,8 @@ bin.includes = about.properties,  about.mappings,  about.ini,  about.html,  META
        .,\
                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			   
 output.. = target/classes/
 \ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.menu.tests/epl-2.0.html b/org.eclipse.osbp.xtext.menu.tests/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu.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.menu.tests/epl-v10.html b/org.eclipse.osbp.xtext.menu.tests/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.menu.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.menu.tests/license.html b/org.eclipse.osbp.xtext.menu.tests/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.menu.tests/license.html
+++ b/org.eclipse.osbp.xtext.menu.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.menu.tests/notice.html b/org.eclipse.osbp.xtext.menu.tests/notice.html
index c3d34c3..008b801 100644
--- a/org.eclipse.osbp.xtext.menu.tests/notice.html
+++ b/org.eclipse.osbp.xtext.menu.tests/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.menu.tests/pom.xml b/org.eclipse.osbp.xtext.menu.tests/pom.xml
index b29b126..4f6cf10 100644
--- a/org.eclipse.osbp.xtext.menu.tests/pom.xml
+++ b/org.eclipse.osbp.xtext.menu.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.menu.ui/LICENSE.txt b/org.eclipse.osbp.xtext.menu.ui/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.menu.ui/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.menu.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.menu.ui/about.html b/org.eclipse.osbp.xtext.menu.ui/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.menu.ui/about.html
+++ b/org.eclipse.osbp.xtext.menu.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.menu.ui/about.properties b/org.eclipse.osbp.xtext.menu.ui/about.properties
index 1bd754c..16c18b5 100644
--- a/org.eclipse.osbp.xtext.menu.ui/about.properties
+++ b/org.eclipse.osbp.xtext.menu.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.menu.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.menu.ui/build.properties b/org.eclipse.osbp.xtext.menu.ui/build.properties
index 2c245e8..084bafd 100644
--- a/org.eclipse.osbp.xtext.menu.ui/build.properties
+++ b/org.eclipse.osbp.xtext.menu.ui/build.properties
@@ -7,10 +7,10 @@ bin.includes = about.properties,  about.mappings,  about.ini,  about.html,  META
                i18n/,\
                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/
 output.. = target/classes/
diff --git a/org.eclipse.osbp.xtext.menu.ui/epl-2.0.html b/org.eclipse.osbp.xtext.menu.ui/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu.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.menu.ui/epl-v10.html b/org.eclipse.osbp.xtext.menu.ui/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.menu.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.menu.ui/license.html b/org.eclipse.osbp.xtext.menu.ui/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.menu.ui/license.html
+++ b/org.eclipse.osbp.xtext.menu.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.menu.ui/pom.xml b/org.eclipse.osbp.xtext.menu.ui/pom.xml
index e8b23f1..e5b885d 100644
--- a/org.eclipse.osbp.xtext.menu.ui/pom.xml
+++ b/org.eclipse.osbp.xtext.menu.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.menu.ui/src-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/AbstractMenuDslProposalProvider.java b/org.eclipse.osbp.xtext.menu.ui/src-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/AbstractMenuDslProposalProvider.java
index 411275e..dba8852 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/AbstractMenuDslProposalProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/src-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/AbstractMenuDslProposalProvider.java
@@ -21,7 +21,7 @@ public abstract class AbstractMenuDslProposalProvider extends OXtypeProposalProv
 	public void completeMenuModel_ImportSection(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuModel_Packages(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuModel_Menupackage(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeMenuPackage_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -33,9 +33,6 @@ public abstract class AbstractMenuDslProposalProvider extends OXtypeProposalProv
 	public void completeMenuPackage_CollapsedImage(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuPackage_SubMenuIsAccordion(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void completeMenuPackage_Height(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -45,59 +42,71 @@ public abstract class AbstractMenuDslProposalProvider extends OXtypeProposalProv
 	public void completeMenuPackage_HasDesigner(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuPackage_Entries(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuPackage_Categories(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuEntry_Entryid(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuCategory_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuEntry_Description(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuCategory_HasTable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_DescriptionValue(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	public void completeMenuCategory_Table(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuEntry_HasImage(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuCategory_HasDialog(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_Image(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	public void completeMenuCategory_Dialog(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuEntry_ShowBadge(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuCategory_HasUserFilter(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_HasProcess(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuCategory_HasReportPrinter(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_Process(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	public void completeMenuCategory_HasKeyBinding(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
 	}
-	public void completeMenuEntry_HasPerspective(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuCategory_HasSystemSettings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_Perspective(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	public void completeMenuCategory_Trees(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuEntry_HasTable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuTree_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeMenuTree_HasTooltip(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_Table(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	public void completeMenuTree_Tooltip(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuEntry_HasDialog(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuTree_Entries(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeMenuEntry_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeMenuEntry_HasIcon(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_Dialog(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	public void completeMenuEntry_Icon(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMenuEntry_HasUserFilter(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuEntry_HasProcess(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_HasKeyBinding(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeMenuEntry_Process(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeMenuEntry_HasPerspective(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void completeMenuEntry_Subentries(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	public void completeMenuEntry_Perspective(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
 	}
 
 	public void complete_MenuModel(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -106,6 +115,12 @@ public abstract class AbstractMenuDslProposalProvider extends OXtypeProposalProv
 	public void complete_MenuPackage(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_MenuCategory(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void complete_MenuTree(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_MenuEntry(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
diff --git a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLDocumentationTranslator.java b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLDocumentationTranslator.java
index 9f39a72..46d3509 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLDocumentationTranslator.java
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLDocumentationTranslator.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.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHover.java b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHover.java
index 4f22176..894f2f9 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHover.java
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHover.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.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverDocumentationProvider.java b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverDocumentationProvider.java
index 133b8b9..7ff85ff 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverDocumentationProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverDocumentationProvider.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.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverProvider.java b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverProvider.java
index 1909e28..fbaa6b8 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDSLEObjectHoverProvider.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.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDslUiModule.java b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDslUiModule.java
index 13ef28e..4d8fb3f 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDslUiModule.java
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/MenuDslUiModule.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.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.xtend b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.xtend
index ee8741e..e8a652f 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.xtend
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.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
@@ -79,7 +81,7 @@ class MenuDslProposalProvider extends AbstractMenuDslProposalProvider {
 		return true
 	}
 
-	override completeMenuEntry_Image(EObject model, Assignment assignment, ContentAssistContext context,
+	override completeMenuEntry_Icon(EObject model, Assignment assignment, ContentAssistContext context,
 		ICompletionProposalAcceptor acceptor) {
 		imageFilePickerProposal(model, assignment, context, acceptor, ".png")
 	}
diff --git a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.xtend b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.xtend
index c17a51f..d97e13f 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.xtend
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.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.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.xtend b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.xtend
index ee6aaa8..3e6faef 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.xtend
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.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
@@ -20,8 +22,10 @@ package org.eclipse.osbp.xtext.menu.ui.labeling
 import com.google.inject.Inject
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
 import org.eclipse.osbp.xtext.basic.ui.labeling.BasicDSLLabelProvider
+import org.eclipse.osbp.xtext.menu.MenuCategory
 import org.eclipse.osbp.xtext.menu.MenuEntry
 import org.eclipse.osbp.xtext.menu.MenuModel
+import org.eclipse.osbp.xtext.menu.MenuTree
 
 /**
  * Provides labels for a EObjects.
@@ -51,7 +55,9 @@ class MenuDslLabelProvider extends BasicDSLLabelProvider {
 	 */ /* ******************************************************************************************* */
 	 override text ( Object o ) {
 		switch (o) {
-			MenuEntry	:	generateText( o, 'entry'			, (o as MenuEntry 			).entryid )
+			MenuCategory:	generateText( o, 'category'		, (o as MenuCategory		).name )
+			MenuTree	:	generateText( o, 'tree'			, (o as MenuTree 			).name )
+			MenuEntry	:	generateText( o, 'entry'		, (o as MenuEntry 			).name )
 			default		:	super.text( o )
 		}
 	}
@@ -74,6 +80,8 @@ class MenuDslLabelProvider extends BasicDSLLabelProvider {
 	override image ( Object o ) {
 		switch (o) {
 			MenuModel	:	getInternalImage( 'model.png', class)
+			MenuCategory:	getInternalImage( 'dsl_menu.png', class)
+			MenuTree	:	getInternalImage( 'dsl_menu.png', class)
 			MenuEntry	:	getInternalImage( 'dsl_menu.png', class)
 			default		:	super.image( o )
 		}
diff --git a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.xtend b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.xtend
index c8770c5..6224ad4 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.xtend
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.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.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.xtend b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.xtend
index 55c746d..bd1aa79 100644
--- a/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.xtend
+++ b/org.eclipse.osbp.xtext.menu.ui/src/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.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.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/ImageFileNameTextApplier.java b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/ImageFileNameTextApplier.java
index f7c8424..6d428f5 100644
--- a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/ImageFileNameTextApplier.java
+++ b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/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.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.java b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.java
index 87154e0..857489c 100644
--- a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/contentassist/MenuDslProposalProvider.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
@@ -60,7 +62,7 @@ public class MenuDslProposalProvider extends AbstractMenuDslProposalProvider {
   }
   
   @Override
-  public void completeMenuEntry_Image(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) {
+  public void completeMenuEntry_Icon(final EObject model, final Assignment assignment, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) {
     this.imageFilePickerProposal(model, assignment, context, acceptor, ".png");
   }
   
diff --git a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.java b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.java
index ac68d55..816d8e2 100644
--- a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslDescriptionLabelProvider.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.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.java b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.java
index 49ed109..f1e384b 100644
--- a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/labeling/MenuDslLabelProvider.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
@@ -17,8 +19,10 @@ package org.eclipse.osbp.xtext.menu.ui.labeling;
 import com.google.inject.Inject;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.osbp.xtext.basic.ui.labeling.BasicDSLLabelProvider;
+import org.eclipse.osbp.xtext.menu.MenuCategory;
 import org.eclipse.osbp.xtext.menu.MenuEntry;
 import org.eclipse.osbp.xtext.menu.MenuModel;
+import org.eclipse.osbp.xtext.menu.MenuTree;
 
 /**
  * Provides labels for a EObjects.
@@ -36,9 +40,21 @@ public class MenuDslLabelProvider extends BasicDSLLabelProvider {
   public Object text(final Object o) {
     Object _switchResult = null;
     boolean _matched = false;
-    if (o instanceof MenuEntry) {
+    if (o instanceof MenuCategory) {
       _matched=true;
-      _switchResult = this.generateText(o, "entry", ((MenuEntry) o).getEntryid());
+      _switchResult = this.generateText(o, "category", ((MenuCategory) o).getName());
+    }
+    if (!_matched) {
+      if (o instanceof MenuTree) {
+        _matched=true;
+        _switchResult = this.generateText(o, "tree", ((MenuTree) o).getName());
+      }
+    }
+    if (!_matched) {
+      if (o instanceof MenuEntry) {
+        _matched=true;
+        _switchResult = this.generateText(o, "entry", ((MenuEntry) o).getName());
+      }
     }
     if (!_matched) {
       _switchResult = super.text(o);
@@ -55,6 +71,18 @@ public class MenuDslLabelProvider extends BasicDSLLabelProvider {
       _switchResult = this.getInternalImage("model.png", this.getClass());
     }
     if (!_matched) {
+      if (o instanceof MenuCategory) {
+        _matched=true;
+        _switchResult = this.getInternalImage("dsl_menu.png", this.getClass());
+      }
+    }
+    if (!_matched) {
+      if (o instanceof MenuTree) {
+        _matched=true;
+        _switchResult = this.getInternalImage("dsl_menu.png", this.getClass());
+      }
+    }
+    if (!_matched) {
       if (o instanceof MenuEntry) {
         _matched=true;
         _switchResult = this.getInternalImage("dsl_menu.png", this.getClass());
diff --git a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.java b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.java
index c4b8a24..4275962 100644
--- a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/outline/MenuDslOutlineTreeProvider.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.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.java b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.java
index d2debbd..5831d7e 100644
--- a/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.java
+++ b/org.eclipse.osbp.xtext.menu.ui/xtend-gen/org/eclipse/osbp/xtext/menu/ui/quickfix/MenuDslQuickfixProvider.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.menu/LICENSE.txt b/org.eclipse.osbp.xtext.menu/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.xtext.menu/LICENSE.txt
+++ b/org.eclipse.osbp.xtext.menu/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.menu/about.html b/org.eclipse.osbp.xtext.menu/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.xtext.menu/about.html
+++ b/org.eclipse.osbp.xtext.menu/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.menu/about.properties b/org.eclipse.osbp.xtext.menu/about.properties
index a4a5500..c69fdac 100644
--- a/org.eclipse.osbp.xtext.menu/about.properties
+++ b/org.eclipse.osbp.xtext.menu/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.menu
 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.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuCategory.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuCategory.java
new file mode 100644
index 0000000..e74e38f
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuCategory.java
@@ -0,0 +1,327 @@
+/**
+ * Copyright (c) 2014,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 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:  
+ *  		Loetz GmbH&Co.KG - Initial implementation 
+ *  
+ */
+package org.eclipse.osbp.xtext.menu;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.osbp.dsl.semantic.common.types.LPackage;
+
+import org.eclipse.osbp.xtext.dialogdsl.Dialog;
+
+import org.eclipse.osbp.xtext.table.Table;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Menu Category</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTrees <em>Trees</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasTable <em>Has Table</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTable <em>Table</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasDialog <em>Has Dialog</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#getDialog <em>Dialog</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasUserFilter <em>Has User Filter</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasReportPrinter <em>Has Report Printer</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasKeyBinding <em>Has Key Binding</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasSystemSettings <em>Has System Settings</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasTooltip <em>Has Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTooltip <em>Tooltip</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory()
+ * @model
+ * @generated
+ */
+public interface MenuCategory extends LPackage {
+	/**
+	 * Returns the value of the '<em><b>Trees</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.osbp.xtext.menu.MenuTree}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Trees</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>Trees</em>' containment reference list.
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_Trees()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<MenuTree> getTrees();
+
+	/**
+	 * Returns the value of the '<em><b>Has Table</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has Table</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has Table</em>' attribute.
+	 * @see #setHasTable(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_HasTable()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasTable();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasTable <em>Has Table</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has Table</em>' attribute.
+	 * @see #isHasTable()
+	 * @generated
+	 */
+	void setHasTable(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Table</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Table</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Table</em>' reference.
+	 * @see #setTable(Table)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_Table()
+	 * @model
+	 * @generated
+	 */
+	Table getTable();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTable <em>Table</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Table</em>' reference.
+	 * @see #getTable()
+	 * @generated
+	 */
+	void setTable(Table value);
+
+	/**
+	 * Returns the value of the '<em><b>Has Dialog</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has Dialog</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has Dialog</em>' attribute.
+	 * @see #setHasDialog(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_HasDialog()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasDialog();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasDialog <em>Has Dialog</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has Dialog</em>' attribute.
+	 * @see #isHasDialog()
+	 * @generated
+	 */
+	void setHasDialog(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Dialog</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dialog</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dialog</em>' reference.
+	 * @see #setDialog(Dialog)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_Dialog()
+	 * @model
+	 * @generated
+	 */
+	Dialog getDialog();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#getDialog <em>Dialog</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dialog</em>' reference.
+	 * @see #getDialog()
+	 * @generated
+	 */
+	void setDialog(Dialog value);
+
+	/**
+	 * Returns the value of the '<em><b>Has User Filter</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has User Filter</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has User Filter</em>' attribute.
+	 * @see #setHasUserFilter(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_HasUserFilter()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasUserFilter();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasUserFilter <em>Has User Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has User Filter</em>' attribute.
+	 * @see #isHasUserFilter()
+	 * @generated
+	 */
+	void setHasUserFilter(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Has Report Printer</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has Report Printer</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has Report Printer</em>' attribute.
+	 * @see #setHasReportPrinter(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_HasReportPrinter()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasReportPrinter();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasReportPrinter <em>Has Report Printer</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has Report Printer</em>' attribute.
+	 * @see #isHasReportPrinter()
+	 * @generated
+	 */
+	void setHasReportPrinter(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Has Key Binding</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has Key Binding</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has Key Binding</em>' attribute.
+	 * @see #setHasKeyBinding(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_HasKeyBinding()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasKeyBinding();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasKeyBinding <em>Has Key Binding</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has Key Binding</em>' attribute.
+	 * @see #isHasKeyBinding()
+	 * @generated
+	 */
+	void setHasKeyBinding(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Has System Settings</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has System Settings</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has System Settings</em>' attribute.
+	 * @see #setHasSystemSettings(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_HasSystemSettings()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasSystemSettings();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasSystemSettings <em>Has System Settings</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has System Settings</em>' attribute.
+	 * @see #isHasSystemSettings()
+	 * @generated
+	 */
+	void setHasSystemSettings(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Has Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has Tooltip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has Tooltip</em>' attribute.
+	 * @see #setHasTooltip(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_HasTooltip()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasTooltip();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasTooltip <em>Has Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has Tooltip</em>' attribute.
+	 * @see #isHasTooltip()
+	 * @generated
+	 */
+	void setHasTooltip(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Tooltip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tooltip</em>' attribute.
+	 * @see #setTooltip(String)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuCategory_Tooltip()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTooltip();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTooltip <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tooltip</em>' attribute.
+	 * @see #getTooltip()
+	 * @generated
+	 */
+	void setTooltip(String value);
+
+} // MenuCategory
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslFactory.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslFactory.java
index d9632c5..59ca358 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslFactory.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslFactory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -40,22 +42,31 @@ public interface MenuDslFactory extends EFactory {
 	MenuModel createMenuModel();
 
 	/**
-	 * Returns a new object of class '<em>Menu Lazy Resolver</em>'.
+	 * Returns a new object of class '<em>Menu Package</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Menu Lazy Resolver</em>'.
+	 * @return a new object of class '<em>Menu Package</em>'.
 	 * @generated
 	 */
-	MenuLazyResolver createMenuLazyResolver();
+	MenuPackage createMenuPackage();
 
 	/**
-	 * Returns a new object of class '<em>Menu Package</em>'.
+	 * Returns a new object of class '<em>Menu Category</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Menu Package</em>'.
+	 * @return a new object of class '<em>Menu Category</em>'.
 	 * @generated
 	 */
-	MenuPackage createMenuPackage();
+	MenuCategory createMenuCategory();
+
+	/**
+	 * Returns a new object of class '<em>Menu Tree</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Menu Tree</em>'.
+	 * @generated
+	 */
+	MenuTree createMenuTree();
 
 	/**
 	 * Returns a new object of class '<em>Menu Entry</em>'.
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslPackage.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslPackage.java
index b5b5bbc..1c6365b 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslPackage.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuDslPackage.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -14,7 +16,6 @@ package org.eclipse.osbp.xtext.menu;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -34,7 +35,7 @@ import org.eclipse.osbp.dsl.semantic.common.types.OSBPTypesPackage;
  * <!-- end-user-doc -->
  * @see org.eclipse.osbp.xtext.menu.MenuDslFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel fileExtensions='menu' modelName='MenuDsl' prefix='MenuDsl' updateClasspath='false' loadInitialization='false' literalsInterface='true' copyrightText='Copyright (c) 2014,2016 Loetz GmbH&Co.KG (Heidelberg)\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 Contributors:  \r\n \t\tLoetz GmbH&Co.KG - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel fileExtensions='menu' modelName='MenuDsl' prefix='MenuDsl' updateClasspath='false' loadInitialization='false' literalsInterface='true' copyrightText='Copyright (c) 2014,2016 Loetz GmbH&Co.KG (Heidelberg)\r\n All rights reserved. This program and the accompanying materials \r\n are made available under the terms of the Eclipse Public License 2.0  \r\n which accompanies this distribution, and is available at \r\n https://www.eclipse.org/legal/epl-v2.0/ \r\n\r\nSPDX-License-Identifier: EPL-2.0 \r\n\r\n  Contributors:  \r\n \t\tLoetz GmbH&Co.KG - Initial implementation \r\n ' basePackage='org.eclipse.osbp.xtext'"
  *        annotation="http://www.eclipse.org/emf/2002/Ecore rootPackage='menudsl'"
  * @generated
  */
@@ -91,13 +92,13 @@ public interface MenuDslPackage extends EPackage {
 	int MENU_MODEL__IMPORT_SECTION = 0;
 
 	/**
-	 * The feature id for the '<em><b>Packages</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Menupackage</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_MODEL__PACKAGES = 1;
+	int MENU_MODEL__MENUPACKAGE = 1;
 
 	/**
 	 * The number of structural features of the '<em>Menu Model</em>' class.
@@ -118,23 +119,86 @@ public interface MenuDslPackage extends EPackage {
 	int MENU_MODEL_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuLazyResolverImpl <em>Menu Lazy Resolver</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl <em>Menu Package</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuPackage()
+	 * @generated
+	 */
+	int MENU_PACKAGE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_PACKAGE__NAME = OSBPTypesPackage.LPACKAGE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_PACKAGE__CATEGORIES = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded Image</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_PACKAGE__EXPANDED_IMAGE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Collapsed Image</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_PACKAGE__COLLAPSED_IMAGE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_PACKAGE__WIDTH = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_PACKAGE__HEIGHT = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Has Designer</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.osbp.xtext.menu.impl.MenuLazyResolverImpl
-	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuLazyResolver()
 	 * @generated
+	 * @ordered
 	 */
-	int MENU_LAZY_RESOLVER = 1;
+	int MENU_PACKAGE__HAS_DESIGNER = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of structural features of the '<em>Menu Lazy Resolver</em>' class.
+	 * The number of structural features of the '<em>Menu Package</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_LAZY_RESOLVER_FEATURE_COUNT = 0;
+	int MENU_PACKAGE_FEATURE_COUNT = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 6;
 
 	/**
 	 * The operation id for the '<em>EResolve Proxy</em>' operation.
@@ -143,26 +207,26 @@ public interface MenuDslPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_LAZY_RESOLVER___ERESOLVE_PROXY__INTERNALEOBJECT = 0;
+	int MENU_PACKAGE___ERESOLVE_PROXY__OBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
 
 	/**
-	 * The number of operations of the '<em>Menu Lazy Resolver</em>' class.
+	 * The number of operations of the '<em>Menu Package</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_LAZY_RESOLVER_OPERATION_COUNT = 1;
+	int MENU_PACKAGE_OPERATION_COUNT = OSBPTypesPackage.LPACKAGE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl <em>Menu Package</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl <em>Menu Category</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl
-	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuPackage()
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuCategory()
 	 * @generated
 	 */
-	int MENU_PACKAGE = 2;
+	int MENU_CATEGORY = 2;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -171,260 +235,297 @@ public interface MenuDslPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__NAME = OSBPTypesPackage.LPACKAGE__NAME;
+	int MENU_CATEGORY__NAME = OSBPTypesPackage.LPACKAGE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Entries</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Trees</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__ENTRIES = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 0;
+	int MENU_CATEGORY__TREES = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sub Menu Is Accordion</b></em>' attribute.
+	 * The feature id for the '<em><b>Has Table</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__SUB_MENU_IS_ACCORDION = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 1;
+	int MENU_CATEGORY__HAS_TABLE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Expanded Image</b></em>' attribute.
+	 * The feature id for the '<em><b>Table</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__EXPANDED_IMAGE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 2;
+	int MENU_CATEGORY__TABLE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Collapsed Image</b></em>' attribute.
+	 * The feature id for the '<em><b>Has Dialog</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__COLLAPSED_IMAGE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 3;
+	int MENU_CATEGORY__HAS_DIALOG = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
+	 * The feature id for the '<em><b>Dialog</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__WIDTH = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 4;
+	int MENU_CATEGORY__DIALOG = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
+	 * The feature id for the '<em><b>Has User Filter</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__HEIGHT = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 5;
+	int MENU_CATEGORY__HAS_USER_FILTER = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Has Designer</b></em>' attribute.
+	 * The feature id for the '<em><b>Has Report Printer</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE__HAS_DESIGNER = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 6;
+	int MENU_CATEGORY__HAS_REPORT_PRINTER = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the '<em>Menu Package</em>' class.
+	 * The feature id for the '<em><b>Has Key Binding</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE_FEATURE_COUNT = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 7;
+	int MENU_CATEGORY__HAS_KEY_BINDING = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 7;
 
 	/**
-	 * The operation id for the '<em>EResolve Proxy</em>' operation.
+	 * The feature id for the '<em><b>Has System Settings</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
+	int MENU_CATEGORY__HAS_SYSTEM_SETTINGS = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 8;
 
 	/**
-	 * The number of operations of the '<em>Menu Package</em>' class.
+	 * The feature id for the '<em><b>Has Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_PACKAGE_OPERATION_COUNT = OSBPTypesPackage.LPACKAGE_OPERATION_COUNT + 0;
+	int MENU_CATEGORY__HAS_TOOLTIP = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 9;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl <em>Menu Entry</em>}' class.
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl
-	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuEntry()
 	 * @generated
+	 * @ordered
 	 */
-	int MENU_ENTRY = 3;
+	int MENU_CATEGORY__TOOLTIP = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Entryid</b></em>' attribute.
+	 * The number of structural features of the '<em>Menu Category</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__ENTRYID = MENU_LAZY_RESOLVER_FEATURE_COUNT + 0;
+	int MENU_CATEGORY_FEATURE_COUNT = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Has Image</b></em>' attribute.
+	 * The operation id for the '<em>EResolve Proxy</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__HAS_IMAGE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 1;
+	int MENU_CATEGORY___ERESOLVE_PROXY__OBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
 
 	/**
-	 * The feature id for the '<em><b>Image</b></em>' attribute.
+	 * The number of operations of the '<em>Menu Category</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__IMAGE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 2;
+	int MENU_CATEGORY_OPERATION_COUNT = OSBPTypesPackage.LPACKAGE_OPERATION_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * The meta object id for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuTreeImpl <em>Menu Tree</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuTreeImpl
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuTree()
+	 * @generated
+	 */
+	int MENU_TREE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__DESCRIPTION = MENU_LAZY_RESOLVER_FEATURE_COUNT + 3;
+	int MENU_TREE__NAME = OSBPTypesPackage.LPACKAGE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Description Value</b></em>' attribute.
+	 * The feature id for the '<em><b>Has Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__DESCRIPTION_VALUE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 4;
+	int MENU_TREE__HAS_TOOLTIP = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Subentries</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__SUBENTRIES = MENU_LAZY_RESOLVER_FEATURE_COUNT + 5;
+	int MENU_TREE__TOOLTIP = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Has Process</b></em>' attribute.
+	 * The feature id for the '<em><b>Entries</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__HAS_PROCESS = MENU_LAZY_RESOLVER_FEATURE_COUNT + 6;
+	int MENU_TREE__ENTRIES = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Process</b></em>' reference.
+	 * The number of structural features of the '<em>Menu Tree</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__PROCESS = MENU_LAZY_RESOLVER_FEATURE_COUNT + 7;
+	int MENU_TREE_FEATURE_COUNT = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Has Perspective</b></em>' attribute.
+	 * The operation id for the '<em>EResolve Proxy</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__HAS_PERSPECTIVE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 8;
+	int MENU_TREE___ERESOLVE_PROXY__OBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
 
 	/**
-	 * The feature id for the '<em><b>Perspective</b></em>' reference.
+	 * The number of operations of the '<em>Menu Tree</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_TREE_OPERATION_COUNT = OSBPTypesPackage.LPACKAGE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl <em>Menu Entry</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl
+	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuEntry()
+	 * @generated
+	 */
+	int MENU_ENTRY = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__PERSPECTIVE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 9;
+	int MENU_ENTRY__NAME = OSBPTypesPackage.LPACKAGE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Show Badge</b></em>' attribute.
+	 * The feature id for the '<em><b>Has Icon</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__SHOW_BADGE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 10;
+	int MENU_ENTRY__HAS_ICON = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Has Table</b></em>' attribute.
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__HAS_TABLE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 11;
+	int MENU_ENTRY__ICON = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' reference.
+	 * The feature id for the '<em><b>Has Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__TABLE = MENU_LAZY_RESOLVER_FEATURE_COUNT + 12;
+	int MENU_ENTRY__HAS_TOOLTIP = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Has Dialog</b></em>' attribute.
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__HAS_DIALOG = MENU_LAZY_RESOLVER_FEATURE_COUNT + 13;
+	int MENU_ENTRY__TOOLTIP = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Dialog</b></em>' reference.
+	 * The feature id for the '<em><b>Has Process</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__DIALOG = MENU_LAZY_RESOLVER_FEATURE_COUNT + 14;
+	int MENU_ENTRY__HAS_PROCESS = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Has User Filter</b></em>' attribute.
+	 * The feature id for the '<em><b>Process</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__HAS_USER_FILTER = MENU_LAZY_RESOLVER_FEATURE_COUNT + 15;
+	int MENU_ENTRY__PROCESS = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Has Key Binding</b></em>' attribute.
+	 * The feature id for the '<em><b>Has Perspective</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY__HAS_KEY_BINDING = MENU_LAZY_RESOLVER_FEATURE_COUNT + 16;
+	int MENU_ENTRY__HAS_PERSPECTIVE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Perspective</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENU_ENTRY__PERSPECTIVE = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 7;
 
 	/**
 	 * The number of structural features of the '<em>Menu Entry</em>' class.
@@ -433,7 +534,7 @@ public interface MenuDslPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY_FEATURE_COUNT = MENU_LAZY_RESOLVER_FEATURE_COUNT + 17;
+	int MENU_ENTRY_FEATURE_COUNT = OSBPTypesPackage.LPACKAGE_FEATURE_COUNT + 8;
 
 	/**
 	 * The operation id for the '<em>EResolve Proxy</em>' operation.
@@ -442,7 +543,7 @@ public interface MenuDslPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY___ERESOLVE_PROXY__INTERNALEOBJECT = MENU_LAZY_RESOLVER___ERESOLVE_PROXY__INTERNALEOBJECT;
+	int MENU_ENTRY___ERESOLVE_PROXY__OBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
 
 	/**
 	 * The number of operations of the '<em>Menu Entry</em>' class.
@@ -451,7 +552,7 @@ public interface MenuDslPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MENU_ENTRY_OPERATION_COUNT = MENU_LAZY_RESOLVER_OPERATION_COUNT + 0;
+	int MENU_ENTRY_OPERATION_COUNT = OSBPTypesPackage.LPACKAGE_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '<em>Internal EObject</em>' data type.
@@ -461,7 +562,7 @@ public interface MenuDslPackage extends EPackage {
 	 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getInternalEObject()
 	 * @generated
 	 */
-	int INTERNAL_EOBJECT = 4;
+	int INTERNAL_EOBJECT = 5;
 
 
 	/**
@@ -486,35 +587,15 @@ public interface MenuDslPackage extends EPackage {
 	EReference getMenuModel_ImportSection();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.osbp.xtext.menu.MenuModel#getPackages <em>Packages</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.osbp.xtext.menu.MenuModel#getMenupackage <em>Menupackage</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Packages</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuModel#getPackages()
+	 * @return the meta object for the containment reference '<em>Menupackage</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuModel#getMenupackage()
 	 * @see #getMenuModel()
 	 * @generated
 	 */
-	EReference getMenuModel_Packages();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.menu.MenuLazyResolver <em>Menu Lazy Resolver</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Menu Lazy Resolver</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuLazyResolver
-	 * @generated
-	 */
-	EClass getMenuLazyResolver();
-
-	/**
-	 * Returns the meta object for the '{@link org.eclipse.osbp.xtext.menu.MenuLazyResolver#eResolveProxy(org.eclipse.emf.ecore.InternalEObject) <em>EResolve Proxy</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>EResolve Proxy</em>' operation.
-	 * @see org.eclipse.osbp.xtext.menu.MenuLazyResolver#eResolveProxy(org.eclipse.emf.ecore.InternalEObject)
-	 * @generated
-	 */
-	EOperation getMenuLazyResolver__EResolveProxy__InternalEObject();
+	EReference getMenuModel_Menupackage();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.menu.MenuPackage <em>Menu Package</em>}'.
@@ -527,26 +608,15 @@ public interface MenuDslPackage extends EPackage {
 	EClass getMenuPackage();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.osbp.xtext.menu.MenuPackage#getEntries <em>Entries</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.osbp.xtext.menu.MenuPackage#getCategories <em>Categories</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Entries</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuPackage#getEntries()
+	 * @return the meta object for the containment reference list '<em>Categories</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuPackage#getCategories()
 	 * @see #getMenuPackage()
 	 * @generated
 	 */
-	EReference getMenuPackage_Entries();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuPackage#isSubMenuIsAccordion <em>Sub Menu Is Accordion</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Sub Menu Is Accordion</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuPackage#isSubMenuIsAccordion()
-	 * @see #getMenuPackage()
-	 * @generated
-	 */
-	EAttribute getMenuPackage_SubMenuIsAccordion();
+	EReference getMenuPackage_Categories();
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuPackage#getExpandedImage <em>Expanded Image</em>}'.
@@ -604,201 +674,276 @@ public interface MenuDslPackage extends EPackage {
 	EAttribute getMenuPackage_HasDesigner();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.menu.MenuEntry <em>Menu Entry</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.menu.MenuCategory <em>Menu Category</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Menu Entry</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry
+	 * @return the meta object for class '<em>Menu Category</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory
 	 * @generated
 	 */
-	EClass getMenuEntry();
+	EClass getMenuCategory();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getEntryid <em>Entryid</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTrees <em>Trees</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Entryid</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getEntryid()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the containment reference list '<em>Trees</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#getTrees()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_Entryid();
+	EReference getMenuCategory_Trees();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasImage <em>Has Image</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasTable <em>Has Table</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Image</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasImage()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the attribute '<em>Has Table</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#isHasTable()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_HasImage();
+	EAttribute getMenuCategory_HasTable();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getImage <em>Image</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTable <em>Table</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Image</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getImage()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the reference '<em>Table</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#getTable()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_Image();
+	EReference getMenuCategory_Table();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasDialog <em>Has Dialog</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isDescription()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the attribute '<em>Has Dialog</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#isHasDialog()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_Description();
+	EAttribute getMenuCategory_HasDialog();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getDescriptionValue <em>Description Value</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuCategory#getDialog <em>Dialog</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description Value</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getDescriptionValue()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the reference '<em>Dialog</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#getDialog()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_DescriptionValue();
+	EReference getMenuCategory_Dialog();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getSubentries <em>Subentries</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasUserFilter <em>Has User Filter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Subentries</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getSubentries()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the attribute '<em>Has User Filter</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#isHasUserFilter()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EReference getMenuEntry_Subentries();
+	EAttribute getMenuCategory_HasUserFilter();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasProcess <em>Has Process</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasReportPrinter <em>Has Report Printer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Process</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasProcess()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the attribute '<em>Has Report Printer</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#isHasReportPrinter()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_HasProcess();
+	EAttribute getMenuCategory_HasReportPrinter();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getProcess <em>Process</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasKeyBinding <em>Has Key Binding</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Process</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getProcess()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the attribute '<em>Has Key Binding</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#isHasKeyBinding()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EReference getMenuEntry_Process();
+	EAttribute getMenuCategory_HasKeyBinding();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasPerspective <em>Has Perspective</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasSystemSettings <em>Has System Settings</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Perspective</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasPerspective()
-	 * @see #getMenuEntry()
+	 * @return the meta object for the attribute '<em>Has System Settings</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#isHasSystemSettings()
+	 * @see #getMenuCategory()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_HasPerspective();
+	EAttribute getMenuCategory_HasSystemSettings();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getPerspective <em>Perspective</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#isHasTooltip <em>Has Tooltip</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Perspective</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getPerspective()
+	 * @return the meta object for the attribute '<em>Has Tooltip</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#isHasTooltip()
+	 * @see #getMenuCategory()
+	 * @generated
+	 */
+	EAttribute getMenuCategory_HasTooltip();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuCategory#getTooltip <em>Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tooltip</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory#getTooltip()
+	 * @see #getMenuCategory()
+	 * @generated
+	 */
+	EAttribute getMenuCategory_Tooltip();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.menu.MenuTree <em>Menu Tree</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Menu Tree</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuTree
+	 * @generated
+	 */
+	EClass getMenuTree();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuTree#isHasTooltip <em>Has Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Has Tooltip</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuTree#isHasTooltip()
+	 * @see #getMenuTree()
+	 * @generated
+	 */
+	EAttribute getMenuTree_HasTooltip();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuTree#getTooltip <em>Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tooltip</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuTree#getTooltip()
+	 * @see #getMenuTree()
+	 * @generated
+	 */
+	EAttribute getMenuTree_Tooltip();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.osbp.xtext.menu.MenuTree#getEntries <em>Entries</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Entries</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuTree#getEntries()
+	 * @see #getMenuTree()
+	 * @generated
+	 */
+	EReference getMenuTree_Entries();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.xtext.menu.MenuEntry <em>Menu Entry</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Menu Entry</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry
+	 * @generated
+	 */
+	EClass getMenuEntry();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasIcon <em>Has Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Has Icon</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasIcon()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EReference getMenuEntry_Perspective();
+	EAttribute getMenuEntry_HasIcon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isShowBadge <em>Show Badge</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getIcon <em>Icon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Show Badge</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isShowBadge()
+	 * @return the meta object for the attribute '<em>Icon</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getIcon()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_ShowBadge();
+	EAttribute getMenuEntry_Icon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasTable <em>Has Table</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasTooltip <em>Has Tooltip</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Table</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasTable()
+	 * @return the meta object for the attribute '<em>Has Tooltip</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasTooltip()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_HasTable();
+	EAttribute getMenuEntry_HasTooltip();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getTable <em>Table</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getTooltip <em>Tooltip</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Table</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getTable()
+	 * @return the meta object for the attribute '<em>Tooltip</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getTooltip()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EReference getMenuEntry_Table();
+	EAttribute getMenuEntry_Tooltip();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasDialog <em>Has Dialog</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasProcess <em>Has Process</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Dialog</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasDialog()
+	 * @return the meta object for the attribute '<em>Has Process</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasProcess()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_HasDialog();
+	EAttribute getMenuEntry_HasProcess();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getDialog <em>Dialog</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getProcess <em>Process</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Dialog</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getDialog()
+	 * @return the meta object for the reference '<em>Process</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getProcess()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EReference getMenuEntry_Dialog();
+	EReference getMenuEntry_Process();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasUserFilter <em>Has User Filter</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasPerspective <em>Has Perspective</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has User Filter</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasUserFilter()
+	 * @return the meta object for the attribute '<em>Has Perspective</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasPerspective()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_HasUserFilter();
+	EAttribute getMenuEntry_HasPerspective();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasKeyBinding <em>Has Key Binding</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getPerspective <em>Perspective</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Has Key Binding</em>'.
-	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#isHasKeyBinding()
+	 * @return the meta object for the reference '<em>Perspective</em>'.
+	 * @see org.eclipse.osbp.xtext.menu.MenuEntry#getPerspective()
 	 * @see #getMenuEntry()
 	 * @generated
 	 */
-	EAttribute getMenuEntry_HasKeyBinding();
+	EReference getMenuEntry_Perspective();
 
 	/**
 	 * Returns the meta object for data type '{@link org.eclipse.emf.ecore.InternalEObject <em>Internal EObject</em>}'.
@@ -853,242 +998,276 @@ public interface MenuDslPackage extends EPackage {
 		EReference MENU_MODEL__IMPORT_SECTION = eINSTANCE.getMenuModel_ImportSection();
 
 		/**
-		 * The meta object literal for the '<em><b>Packages</b></em>' containment reference list feature.
+		 * The meta object literal for the '<em><b>Menupackage</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MENU_MODEL__MENUPACKAGE = eINSTANCE.getMenuModel_Menupackage();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl <em>Menu Package</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuPackage()
 		 * @generated
 		 */
-		EReference MENU_MODEL__PACKAGES = eINSTANCE.getMenuModel_Packages();
+		EClass MENU_PACKAGE = eINSTANCE.getMenuPackage();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuLazyResolverImpl <em>Menu Lazy Resolver</em>}' class.
+		 * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.osbp.xtext.menu.impl.MenuLazyResolverImpl
-		 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuLazyResolver()
 		 * @generated
 		 */
-		EClass MENU_LAZY_RESOLVER = eINSTANCE.getMenuLazyResolver();
+		EReference MENU_PACKAGE__CATEGORIES = eINSTANCE.getMenuPackage_Categories();
 
 		/**
-		 * The meta object literal for the '<em><b>EResolve Proxy</b></em>' operation.
+		 * The meta object literal for the '<em><b>Expanded Image</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation MENU_LAZY_RESOLVER___ERESOLVE_PROXY__INTERNALEOBJECT = eINSTANCE.getMenuLazyResolver__EResolveProxy__InternalEObject();
+		EAttribute MENU_PACKAGE__EXPANDED_IMAGE = eINSTANCE.getMenuPackage_ExpandedImage();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl <em>Menu Package</em>}' class.
+		 * The meta object literal for the '<em><b>Collapsed Image</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl
-		 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuPackage()
 		 * @generated
 		 */
-		EClass MENU_PACKAGE = eINSTANCE.getMenuPackage();
+		EAttribute MENU_PACKAGE__COLLAPSED_IMAGE = eINSTANCE.getMenuPackage_CollapsedImage();
 
 		/**
-		 * The meta object literal for the '<em><b>Entries</b></em>' containment reference list feature.
+		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MENU_PACKAGE__ENTRIES = eINSTANCE.getMenuPackage_Entries();
+		EAttribute MENU_PACKAGE__WIDTH = eINSTANCE.getMenuPackage_Width();
 
 		/**
-		 * The meta object literal for the '<em><b>Sub Menu Is Accordion</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_PACKAGE__SUB_MENU_IS_ACCORDION = eINSTANCE.getMenuPackage_SubMenuIsAccordion();
+		EAttribute MENU_PACKAGE__HEIGHT = eINSTANCE.getMenuPackage_Height();
 
 		/**
-		 * The meta object literal for the '<em><b>Expanded Image</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has Designer</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_PACKAGE__EXPANDED_IMAGE = eINSTANCE.getMenuPackage_ExpandedImage();
+		EAttribute MENU_PACKAGE__HAS_DESIGNER = eINSTANCE.getMenuPackage_HasDesigner();
 
 		/**
-		 * The meta object literal for the '<em><b>Collapsed Image</b></em>' attribute feature.
+		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl <em>Menu Category</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuCategory()
 		 * @generated
 		 */
-		EAttribute MENU_PACKAGE__COLLAPSED_IMAGE = eINSTANCE.getMenuPackage_CollapsedImage();
+		EClass MENU_CATEGORY = eINSTANCE.getMenuCategory();
 
 		/**
-		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Trees</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_PACKAGE__WIDTH = eINSTANCE.getMenuPackage_Width();
+		EReference MENU_CATEGORY__TREES = eINSTANCE.getMenuCategory_Trees();
 
 		/**
-		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has Table</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_PACKAGE__HEIGHT = eINSTANCE.getMenuPackage_Height();
+		EAttribute MENU_CATEGORY__HAS_TABLE = eINSTANCE.getMenuCategory_HasTable();
 
 		/**
-		 * The meta object literal for the '<em><b>Has Designer</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Table</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_PACKAGE__HAS_DESIGNER = eINSTANCE.getMenuPackage_HasDesigner();
+		EReference MENU_CATEGORY__TABLE = eINSTANCE.getMenuCategory_Table();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl <em>Menu Entry</em>}' class.
+		 * The meta object literal for the '<em><b>Has Dialog</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl
-		 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuEntry()
 		 * @generated
 		 */
-		EClass MENU_ENTRY = eINSTANCE.getMenuEntry();
+		EAttribute MENU_CATEGORY__HAS_DIALOG = eINSTANCE.getMenuCategory_HasDialog();
 
 		/**
-		 * The meta object literal for the '<em><b>Entryid</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Dialog</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__ENTRYID = eINSTANCE.getMenuEntry_Entryid();
+		EReference MENU_CATEGORY__DIALOG = eINSTANCE.getMenuCategory_Dialog();
 
 		/**
-		 * The meta object literal for the '<em><b>Has Image</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has User Filter</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__HAS_IMAGE = eINSTANCE.getMenuEntry_HasImage();
+		EAttribute MENU_CATEGORY__HAS_USER_FILTER = eINSTANCE.getMenuCategory_HasUserFilter();
 
 		/**
-		 * The meta object literal for the '<em><b>Image</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has Report Printer</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__IMAGE = eINSTANCE.getMenuEntry_Image();
+		EAttribute MENU_CATEGORY__HAS_REPORT_PRINTER = eINSTANCE.getMenuCategory_HasReportPrinter();
 
 		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has Key Binding</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__DESCRIPTION = eINSTANCE.getMenuEntry_Description();
+		EAttribute MENU_CATEGORY__HAS_KEY_BINDING = eINSTANCE.getMenuCategory_HasKeyBinding();
 
 		/**
-		 * The meta object literal for the '<em><b>Description Value</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has System Settings</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__DESCRIPTION_VALUE = eINSTANCE.getMenuEntry_DescriptionValue();
+		EAttribute MENU_CATEGORY__HAS_SYSTEM_SETTINGS = eINSTANCE.getMenuCategory_HasSystemSettings();
 
 		/**
-		 * The meta object literal for the '<em><b>Subentries</b></em>' containment reference list feature.
+		 * The meta object literal for the '<em><b>Has Tooltip</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MENU_ENTRY__SUBENTRIES = eINSTANCE.getMenuEntry_Subentries();
+		EAttribute MENU_CATEGORY__HAS_TOOLTIP = eINSTANCE.getMenuCategory_HasTooltip();
 
 		/**
-		 * The meta object literal for the '<em><b>Has Process</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Tooltip</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__HAS_PROCESS = eINSTANCE.getMenuEntry_HasProcess();
+		EAttribute MENU_CATEGORY__TOOLTIP = eINSTANCE.getMenuCategory_Tooltip();
 
 		/**
-		 * The meta object literal for the '<em><b>Process</b></em>' reference feature.
+		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuTreeImpl <em>Menu Tree</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuTreeImpl
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuTree()
 		 * @generated
 		 */
-		EReference MENU_ENTRY__PROCESS = eINSTANCE.getMenuEntry_Process();
+		EClass MENU_TREE = eINSTANCE.getMenuTree();
 
 		/**
-		 * The meta object literal for the '<em><b>Has Perspective</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has Tooltip</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__HAS_PERSPECTIVE = eINSTANCE.getMenuEntry_HasPerspective();
+		EAttribute MENU_TREE__HAS_TOOLTIP = eINSTANCE.getMenuTree_HasTooltip();
 
 		/**
-		 * The meta object literal for the '<em><b>Perspective</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Tooltip</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MENU_ENTRY__PERSPECTIVE = eINSTANCE.getMenuEntry_Perspective();
+		EAttribute MENU_TREE__TOOLTIP = eINSTANCE.getMenuTree_Tooltip();
 
 		/**
-		 * The meta object literal for the '<em><b>Show Badge</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Entries</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__SHOW_BADGE = eINSTANCE.getMenuEntry_ShowBadge();
+		EReference MENU_TREE__ENTRIES = eINSTANCE.getMenuTree_Entries();
 
 		/**
-		 * The meta object literal for the '<em><b>Has Table</b></em>' attribute feature.
+		 * The meta object literal for the '{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl <em>Menu Entry</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl
+		 * @see org.eclipse.osbp.xtext.menu.impl.MenuDslPackageImpl#getMenuEntry()
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__HAS_TABLE = eINSTANCE.getMenuEntry_HasTable();
+		EClass MENU_ENTRY = eINSTANCE.getMenuEntry();
 
 		/**
-		 * The meta object literal for the '<em><b>Table</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Has Icon</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MENU_ENTRY__TABLE = eINSTANCE.getMenuEntry_Table();
+		EAttribute MENU_ENTRY__HAS_ICON = eINSTANCE.getMenuEntry_HasIcon();
 
 		/**
-		 * The meta object literal for the '<em><b>Has Dialog</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__HAS_DIALOG = eINSTANCE.getMenuEntry_HasDialog();
+		EAttribute MENU_ENTRY__ICON = eINSTANCE.getMenuEntry_Icon();
 
 		/**
-		 * The meta object literal for the '<em><b>Dialog</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Has Tooltip</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MENU_ENTRY__DIALOG = eINSTANCE.getMenuEntry_Dialog();
+		EAttribute MENU_ENTRY__HAS_TOOLTIP = eINSTANCE.getMenuEntry_HasTooltip();
 
 		/**
-		 * The meta object literal for the '<em><b>Has User Filter</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Tooltip</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__HAS_USER_FILTER = eINSTANCE.getMenuEntry_HasUserFilter();
+		EAttribute MENU_ENTRY__TOOLTIP = eINSTANCE.getMenuEntry_Tooltip();
 
 		/**
-		 * The meta object literal for the '<em><b>Has Key Binding</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Has Process</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MENU_ENTRY__HAS_KEY_BINDING = eINSTANCE.getMenuEntry_HasKeyBinding();
+		EAttribute MENU_ENTRY__HAS_PROCESS = eINSTANCE.getMenuEntry_HasProcess();
+
+		/**
+		 * The meta object literal for the '<em><b>Process</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MENU_ENTRY__PROCESS = eINSTANCE.getMenuEntry_Process();
+
+		/**
+		 * The meta object literal for the '<em><b>Has Perspective</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MENU_ENTRY__HAS_PERSPECTIVE = eINSTANCE.getMenuEntry_HasPerspective();
+
+		/**
+		 * The meta object literal for the '<em><b>Perspective</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MENU_ENTRY__PERSPECTIVE = eINSTANCE.getMenuEntry_Perspective();
 
 		/**
 		 * The meta object literal for the '<em>Internal EObject</em>' data type.
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuEntry.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuEntry.java
index fa73957..efab0c7 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuEntry.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuEntry.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -11,16 +13,12 @@
  */
 package org.eclipse.osbp.xtext.menu;
 
-import org.eclipse.emf.common.util.EList;
+import org.eclipse.osbp.dsl.semantic.common.types.LPackage;
 
 import org.eclipse.osbp.xtext.blip.Blip;
 
-import org.eclipse.osbp.xtext.dialogdsl.Dialog;
-
 import org.eclipse.osbp.xtext.perspective.Perspective;
 
-import org.eclipse.osbp.xtext.table.Table;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Menu Entry</b></em>'.
@@ -30,175 +28,124 @@ import org.eclipse.osbp.xtext.table.Table;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getEntryid <em>Entryid</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasImage <em>Has Image</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getImage <em>Image</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getDescriptionValue <em>Description Value</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getSubentries <em>Subentries</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasIcon <em>Has Icon</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasTooltip <em>Has Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getTooltip <em>Tooltip</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasProcess <em>Has Process</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getProcess <em>Process</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasPerspective <em>Has Perspective</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getPerspective <em>Perspective</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isShowBadge <em>Show Badge</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasTable <em>Has Table</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasDialog <em>Has Dialog</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#getDialog <em>Dialog</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasUserFilter <em>Has User Filter</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasKeyBinding <em>Has Key Binding</em>}</li>
  * </ul>
  *
  * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry()
  * @model
  * @generated
  */
-public interface MenuEntry extends MenuLazyResolver {
+public interface MenuEntry extends LPackage {
 	/**
-	 * Returns the value of the '<em><b>Entryid</b></em>' attribute.
+	 * Returns the value of the '<em><b>Has Icon</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Entryid</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Has Icon</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Entryid</em>' attribute.
-	 * @see #setEntryid(String)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Entryid()
+	 * @return the value of the '<em>Has Icon</em>' attribute.
+	 * @see #setHasIcon(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_HasIcon()
 	 * @model unique="false"
 	 * @generated
 	 */
-	String getEntryid();
+	boolean isHasIcon();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getEntryid <em>Entryid</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasIcon <em>Has Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entryid</em>' attribute.
-	 * @see #getEntryid()
+	 * @param value the new value of the '<em>Has Icon</em>' attribute.
+	 * @see #isHasIcon()
 	 * @generated
 	 */
-	void setEntryid(String value);
+	void setHasIcon(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Has Image</b></em>' attribute.
+	 * Returns the value of the '<em><b>Icon</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Has Image</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Icon</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Has Image</em>' attribute.
-	 * @see #setHasImage(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_HasImage()
+	 * @return the value of the '<em>Icon</em>' attribute.
+	 * @see #setIcon(String)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Icon()
 	 * @model unique="false"
 	 * @generated
 	 */
-	boolean isHasImage();
+	String getIcon();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasImage <em>Has Image</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getIcon <em>Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Image</em>' attribute.
-	 * @see #isHasImage()
+	 * @param value the new value of the '<em>Icon</em>' attribute.
+	 * @see #getIcon()
 	 * @generated
 	 */
-	void setHasImage(boolean value);
+	void setIcon(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Image</b></em>' attribute.
+	 * Returns the value of the '<em><b>Has Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Image</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Has Tooltip</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Image</em>' attribute.
-	 * @see #setImage(String)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Image()
+	 * @return the value of the '<em>Has Tooltip</em>' attribute.
+	 * @see #setHasTooltip(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_HasTooltip()
 	 * @model unique="false"
 	 * @generated
 	 */
-	String getImage();
+	boolean isHasTooltip();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getImage <em>Image</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasTooltip <em>Has Tooltip</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Image</em>' attribute.
-	 * @see #getImage()
+	 * @param value the new value of the '<em>Has Tooltip</em>' attribute.
+	 * @see #isHasTooltip()
 	 * @generated
 	 */
-	void setImage(String value);
+	void setHasTooltip(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * Returns the value of the '<em><b>Tooltip</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Tooltip</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Description()
+	 * @return the value of the '<em>Tooltip</em>' attribute.
+	 * @see #setTooltip(String)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Tooltip()
 	 * @model unique="false"
 	 * @generated
 	 */
-	boolean isDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #isDescription()
-	 * @generated
-	 */
-	void setDescription(boolean value);
+	String getTooltip();
 
 	/**
-	 * Returns the value of the '<em><b>Description Value</b></em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getTooltip <em>Tooltip</em>}' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description Value</em>' attribute.
-	 * @see #setDescriptionValue(String)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_DescriptionValue()
-	 * @model unique="false"
+	 * @param value the new value of the '<em>Tooltip</em>' attribute.
+	 * @see #getTooltip()
 	 * @generated
 	 */
-	String getDescriptionValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getDescriptionValue <em>Description Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description Value</em>' attribute.
-	 * @see #getDescriptionValue()
-	 * @generated
-	 */
-	void setDescriptionValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Subentries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.osbp.xtext.menu.MenuEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Subentries</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>Subentries</em>' containment reference list.
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Subentries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<MenuEntry> getSubentries();
+	void setTooltip(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Has Process</b></em>' attribute.
@@ -304,186 +251,4 @@ public interface MenuEntry extends MenuLazyResolver {
 	 */
 	void setPerspective(Perspective value);
 
-	/**
-	 * Returns the value of the '<em><b>Show Badge</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Show Badge</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Show Badge</em>' attribute.
-	 * @see #setShowBadge(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_ShowBadge()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isShowBadge();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isShowBadge <em>Show Badge</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Show Badge</em>' attribute.
-	 * @see #isShowBadge()
-	 * @generated
-	 */
-	void setShowBadge(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Has Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Has Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Has Table</em>' attribute.
-	 * @see #setHasTable(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_HasTable()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isHasTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasTable <em>Has Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Table</em>' attribute.
-	 * @see #isHasTable()
-	 * @generated
-	 */
-	void setHasTable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' reference.
-	 * @see #setTable(Table)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Table()
-	 * @model
-	 * @generated
-	 */
-	Table getTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getTable <em>Table</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' reference.
-	 * @see #getTable()
-	 * @generated
-	 */
-	void setTable(Table value);
-
-	/**
-	 * Returns the value of the '<em><b>Has Dialog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Has Dialog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Has Dialog</em>' attribute.
-	 * @see #setHasDialog(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_HasDialog()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isHasDialog();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasDialog <em>Has Dialog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Dialog</em>' attribute.
-	 * @see #isHasDialog()
-	 * @generated
-	 */
-	void setHasDialog(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Dialog</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dialog</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dialog</em>' reference.
-	 * @see #setDialog(Dialog)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_Dialog()
-	 * @model
-	 * @generated
-	 */
-	Dialog getDialog();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#getDialog <em>Dialog</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dialog</em>' reference.
-	 * @see #getDialog()
-	 * @generated
-	 */
-	void setDialog(Dialog value);
-
-	/**
-	 * Returns the value of the '<em><b>Has User Filter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Has User Filter</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Has User Filter</em>' attribute.
-	 * @see #setHasUserFilter(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_HasUserFilter()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isHasUserFilter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasUserFilter <em>Has User Filter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has User Filter</em>' attribute.
-	 * @see #isHasUserFilter()
-	 * @generated
-	 */
-	void setHasUserFilter(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Has Key Binding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Has Key Binding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Has Key Binding</em>' attribute.
-	 * @see #setHasKeyBinding(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuEntry_HasKeyBinding()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isHasKeyBinding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuEntry#isHasKeyBinding <em>Has Key Binding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Has Key Binding</em>' attribute.
-	 * @see #isHasKeyBinding()
-	 * @generated
-	 */
-	void setHasKeyBinding(boolean value);
-
 } // MenuEntry
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuLazyResolver.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuLazyResolver.java
deleted file mode 100644
index 0239237..0000000
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuLazyResolver.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright (c) 2014,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 
- *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
- * 
- *  Contributors:  
- *  		Loetz GmbH&Co.KG - Initial implementation 
- *  
- */
-package org.eclipse.osbp.xtext.menu;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Menu Lazy Resolver</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuLazyResolver()
- * @model
- * @generated
- */
-public interface MenuLazyResolver extends EObject {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model unique="false" proxyDataType="org.eclipse.osbp.xtext.menu.InternalEObject" proxyUnique="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='return <%org.eclipse.osbp.xtext.oxtype.resource.EcoreUtil3%>.resolve(proxy, this.eResource().getResourceSet());'"
-	 * @generated
-	 */
-	EObject eResolveProxy(InternalEObject proxy);
-
-} // MenuLazyResolver
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuModel.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuModel.java
index 30a577f..3282ac8 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuModel.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuModel.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -11,8 +13,6 @@
  */
 package org.eclipse.osbp.xtext.menu;
 
-import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.xtext.xtype.XImportSection;
@@ -27,7 +27,7 @@ import org.eclipse.xtext.xtype.XImportSection;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuModel#getImportSection <em>Import Section</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuModel#getPackages <em>Packages</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuModel#getMenupackage <em>Menupackage</em>}</li>
  * </ul>
  *
  * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuModel()
@@ -62,19 +62,29 @@ public interface MenuModel extends EObject {
 	void setImportSection(XImportSection value);
 
 	/**
-	 * Returns the value of the '<em><b>Packages</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.osbp.xtext.menu.MenuPackage}.
+	 * Returns the value of the '<em><b>Menupackage</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Packages</em>' containment reference list isn't clear,
+	 * If the meaning of the '<em>Menupackage</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>Packages</em>' containment reference list.
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuModel_Packages()
+	 * @return the value of the '<em>Menupackage</em>' containment reference.
+	 * @see #setMenupackage(MenuPackage)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuModel_Menupackage()
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<MenuPackage> getPackages();
+	MenuPackage getMenupackage();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuModel#getMenupackage <em>Menupackage</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Menupackage</em>' containment reference.
+	 * @see #getMenupackage()
+	 * @generated
+	 */
+	void setMenupackage(MenuPackage value);
 
 } // MenuModel
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuPackage.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuPackage.java
index aa119fb..173f430 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuPackage.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuPackage.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -24,8 +26,7 @@ import org.eclipse.osbp.dsl.semantic.common.types.LPackage;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuPackage#getEntries <em>Entries</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.MenuPackage#isSubMenuIsAccordion <em>Sub Menu Is Accordion</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuPackage#getCategories <em>Categories</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuPackage#getExpandedImage <em>Expanded Image</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuPackage#getCollapsedImage <em>Collapsed Image</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.MenuPackage#getWidth <em>Width</em>}</li>
@@ -39,46 +40,20 @@ import org.eclipse.osbp.dsl.semantic.common.types.LPackage;
  */
 public interface MenuPackage extends LPackage {
 	/**
-	 * Returns the value of the '<em><b>Entries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.osbp.xtext.menu.MenuEntry}.
+	 * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.osbp.xtext.menu.MenuCategory}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Entries</em>' containment reference list isn't clear,
+	 * If the meaning of the '<em>Categories</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>Entries</em>' containment reference list.
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuPackage_Entries()
+	 * @return the value of the '<em>Categories</em>' containment reference list.
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuPackage_Categories()
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<MenuEntry> getEntries();
-
-	/**
-	 * Returns the value of the '<em><b>Sub Menu Is Accordion</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sub Menu Is Accordion</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sub Menu Is Accordion</em>' attribute.
-	 * @see #setSubMenuIsAccordion(boolean)
-	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuPackage_SubMenuIsAccordion()
-	 * @model unique="false"
-	 * @generated
-	 */
-	boolean isSubMenuIsAccordion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuPackage#isSubMenuIsAccordion <em>Sub Menu Is Accordion</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sub Menu Is Accordion</em>' attribute.
-	 * @see #isSubMenuIsAccordion()
-	 * @generated
-	 */
-	void setSubMenuIsAccordion(boolean value);
+	EList<MenuCategory> getCategories();
 
 	/**
 	 * Returns the value of the '<em><b>Expanded Image</b></em>' attribute.
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuTree.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuTree.java
new file mode 100644
index 0000000..716764c
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/MenuTree.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2014,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 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:  
+ *  		Loetz GmbH&Co.KG - Initial implementation 
+ *  
+ */
+package org.eclipse.osbp.xtext.menu;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.osbp.dsl.semantic.common.types.LPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Menu Tree</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuTree#isHasTooltip <em>Has Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuTree#getTooltip <em>Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.MenuTree#getEntries <em>Entries</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuTree()
+ * @model
+ * @generated
+ */
+public interface MenuTree extends LPackage {
+	/**
+	 * Returns the value of the '<em><b>Has Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Has Tooltip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Has Tooltip</em>' attribute.
+	 * @see #setHasTooltip(boolean)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuTree_HasTooltip()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isHasTooltip();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuTree#isHasTooltip <em>Has Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Has Tooltip</em>' attribute.
+	 * @see #isHasTooltip()
+	 * @generated
+	 */
+	void setHasTooltip(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Tooltip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tooltip</em>' attribute.
+	 * @see #setTooltip(String)
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuTree_Tooltip()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTooltip();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.xtext.menu.MenuTree#getTooltip <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tooltip</em>' attribute.
+	 * @see #getTooltip()
+	 * @generated
+	 */
+	void setTooltip(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Entries</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.osbp.xtext.menu.MenuEntry}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Entries</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>Entries</em>' containment reference list.
+	 * @see org.eclipse.osbp.xtext.menu.MenuDslPackage#getMenuTree_Entries()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<MenuEntry> getEntries();
+
+} // MenuTree
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuCategoryImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuCategoryImpl.java
new file mode 100644
index 0000000..b4687a8
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuCategoryImpl.java
@@ -0,0 +1,736 @@
+/**
+ * Copyright (c) 2014,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 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:  
+ *  		Loetz GmbH&Co.KG - Initial implementation 
+ *  
+ */
+package org.eclipse.osbp.xtext.menu.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.dsl.semantic.common.types.impl.LPackageImpl;
+
+import org.eclipse.osbp.xtext.dialogdsl.Dialog;
+
+import org.eclipse.osbp.xtext.menu.MenuCategory;
+import org.eclipse.osbp.xtext.menu.MenuDslPackage;
+import org.eclipse.osbp.xtext.menu.MenuTree;
+
+import org.eclipse.osbp.xtext.table.Table;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Menu Category</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#getTrees <em>Trees</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#isHasTable <em>Has Table</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#getTable <em>Table</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#isHasDialog <em>Has Dialog</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#getDialog <em>Dialog</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#isHasUserFilter <em>Has User Filter</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#isHasReportPrinter <em>Has Report Printer</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#isHasKeyBinding <em>Has Key Binding</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#isHasSystemSettings <em>Has System Settings</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#isHasTooltip <em>Has Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuCategoryImpl#getTooltip <em>Tooltip</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MenuCategoryImpl extends LPackageImpl implements MenuCategory {
+	/**
+	 * The cached value of the '{@link #getTrees() <em>Trees</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTrees()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<MenuTree> trees;
+
+	/**
+	 * The default value of the '{@link #isHasTable() <em>Has Table</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasTable()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_TABLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasTable() <em>Has Table</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasTable()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasTable = HAS_TABLE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTable() <em>Table</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTable()
+	 * @generated
+	 * @ordered
+	 */
+	protected Table table;
+
+	/**
+	 * The default value of the '{@link #isHasDialog() <em>Has Dialog</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasDialog()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_DIALOG_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasDialog() <em>Has Dialog</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasDialog()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasDialog = HAS_DIALOG_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getDialog() <em>Dialog</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDialog()
+	 * @generated
+	 * @ordered
+	 */
+	protected Dialog dialog;
+
+	/**
+	 * The default value of the '{@link #isHasUserFilter() <em>Has User Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasUserFilter()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_USER_FILTER_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasUserFilter() <em>Has User Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasUserFilter()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasUserFilter = HAS_USER_FILTER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isHasReportPrinter() <em>Has Report Printer</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasReportPrinter()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_REPORT_PRINTER_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasReportPrinter() <em>Has Report Printer</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasReportPrinter()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasReportPrinter = HAS_REPORT_PRINTER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isHasKeyBinding() <em>Has Key Binding</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasKeyBinding()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_KEY_BINDING_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasKeyBinding() <em>Has Key Binding</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasKeyBinding()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasKeyBinding = HAS_KEY_BINDING_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isHasSystemSettings() <em>Has System Settings</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasSystemSettings()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_SYSTEM_SETTINGS_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasSystemSettings() <em>Has System Settings</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasSystemSettings()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasSystemSettings = HAS_SYSTEM_SETTINGS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isHasTooltip() <em>Has Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_TOOLTIP_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasTooltip() <em>Has Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasTooltip = HAS_TOOLTIP_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOOLTIP_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected String tooltip = TOOLTIP_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MenuCategoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return MenuDslPackage.Literals.MENU_CATEGORY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<MenuTree> getTrees() {
+		if (trees == null) {
+			trees = new EObjectContainmentEList<MenuTree>(MenuTree.class, this, MenuDslPackage.MENU_CATEGORY__TREES);
+		}
+		return trees;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasTable() {
+		return hasTable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasTable(boolean newHasTable) {
+		boolean oldHasTable = hasTable;
+		hasTable = newHasTable;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__HAS_TABLE, oldHasTable, hasTable));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Table getTable() {
+		if (table != null && table.eIsProxy()) {
+			InternalEObject oldTable = (InternalEObject)table;
+			table = (Table)eResolveProxy(oldTable);
+			if (table != oldTable) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MenuDslPackage.MENU_CATEGORY__TABLE, oldTable, table));
+			}
+		}
+		return table;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Table basicGetTable() {
+		return table;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTable(Table newTable) {
+		Table oldTable = table;
+		table = newTable;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__TABLE, oldTable, table));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasDialog() {
+		return hasDialog;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasDialog(boolean newHasDialog) {
+		boolean oldHasDialog = hasDialog;
+		hasDialog = newHasDialog;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__HAS_DIALOG, oldHasDialog, hasDialog));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Dialog getDialog() {
+		if (dialog != null && dialog.eIsProxy()) {
+			InternalEObject oldDialog = (InternalEObject)dialog;
+			dialog = (Dialog)eResolveProxy(oldDialog);
+			if (dialog != oldDialog) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MenuDslPackage.MENU_CATEGORY__DIALOG, oldDialog, dialog));
+			}
+		}
+		return dialog;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Dialog basicGetDialog() {
+		return dialog;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDialog(Dialog newDialog) {
+		Dialog oldDialog = dialog;
+		dialog = newDialog;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__DIALOG, oldDialog, dialog));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasUserFilter() {
+		return hasUserFilter;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasUserFilter(boolean newHasUserFilter) {
+		boolean oldHasUserFilter = hasUserFilter;
+		hasUserFilter = newHasUserFilter;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__HAS_USER_FILTER, oldHasUserFilter, hasUserFilter));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasReportPrinter() {
+		return hasReportPrinter;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasReportPrinter(boolean newHasReportPrinter) {
+		boolean oldHasReportPrinter = hasReportPrinter;
+		hasReportPrinter = newHasReportPrinter;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__HAS_REPORT_PRINTER, oldHasReportPrinter, hasReportPrinter));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasKeyBinding() {
+		return hasKeyBinding;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasKeyBinding(boolean newHasKeyBinding) {
+		boolean oldHasKeyBinding = hasKeyBinding;
+		hasKeyBinding = newHasKeyBinding;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__HAS_KEY_BINDING, oldHasKeyBinding, hasKeyBinding));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasSystemSettings() {
+		return hasSystemSettings;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasSystemSettings(boolean newHasSystemSettings) {
+		boolean oldHasSystemSettings = hasSystemSettings;
+		hasSystemSettings = newHasSystemSettings;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__HAS_SYSTEM_SETTINGS, oldHasSystemSettings, hasSystemSettings));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasTooltip() {
+		return hasTooltip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasTooltip(boolean newHasTooltip) {
+		boolean oldHasTooltip = hasTooltip;
+		hasTooltip = newHasTooltip;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__HAS_TOOLTIP, oldHasTooltip, hasTooltip));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTooltip() {
+		return tooltip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTooltip(String newTooltip) {
+		String oldTooltip = tooltip;
+		tooltip = newTooltip;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_CATEGORY__TOOLTIP, oldTooltip, tooltip));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MenuDslPackage.MENU_CATEGORY__TREES:
+				return ((InternalEList<?>)getTrees()).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 MenuDslPackage.MENU_CATEGORY__TREES:
+				return getTrees();
+			case MenuDslPackage.MENU_CATEGORY__HAS_TABLE:
+				return isHasTable();
+			case MenuDslPackage.MENU_CATEGORY__TABLE:
+				if (resolve) return getTable();
+				return basicGetTable();
+			case MenuDslPackage.MENU_CATEGORY__HAS_DIALOG:
+				return isHasDialog();
+			case MenuDslPackage.MENU_CATEGORY__DIALOG:
+				if (resolve) return getDialog();
+				return basicGetDialog();
+			case MenuDslPackage.MENU_CATEGORY__HAS_USER_FILTER:
+				return isHasUserFilter();
+			case MenuDslPackage.MENU_CATEGORY__HAS_REPORT_PRINTER:
+				return isHasReportPrinter();
+			case MenuDslPackage.MENU_CATEGORY__HAS_KEY_BINDING:
+				return isHasKeyBinding();
+			case MenuDslPackage.MENU_CATEGORY__HAS_SYSTEM_SETTINGS:
+				return isHasSystemSettings();
+			case MenuDslPackage.MENU_CATEGORY__HAS_TOOLTIP:
+				return isHasTooltip();
+			case MenuDslPackage.MENU_CATEGORY__TOOLTIP:
+				return getTooltip();
+		}
+		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 MenuDslPackage.MENU_CATEGORY__TREES:
+				getTrees().clear();
+				getTrees().addAll((Collection<? extends MenuTree>)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_TABLE:
+				setHasTable((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__TABLE:
+				setTable((Table)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_DIALOG:
+				setHasDialog((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__DIALOG:
+				setDialog((Dialog)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_USER_FILTER:
+				setHasUserFilter((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_REPORT_PRINTER:
+				setHasReportPrinter((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_KEY_BINDING:
+				setHasKeyBinding((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_SYSTEM_SETTINGS:
+				setHasSystemSettings((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_TOOLTIP:
+				setHasTooltip((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__TOOLTIP:
+				setTooltip((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MenuDslPackage.MENU_CATEGORY__TREES:
+				getTrees().clear();
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_TABLE:
+				setHasTable(HAS_TABLE_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__TABLE:
+				setTable((Table)null);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_DIALOG:
+				setHasDialog(HAS_DIALOG_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__DIALOG:
+				setDialog((Dialog)null);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_USER_FILTER:
+				setHasUserFilter(HAS_USER_FILTER_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_REPORT_PRINTER:
+				setHasReportPrinter(HAS_REPORT_PRINTER_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_KEY_BINDING:
+				setHasKeyBinding(HAS_KEY_BINDING_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_SYSTEM_SETTINGS:
+				setHasSystemSettings(HAS_SYSTEM_SETTINGS_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__HAS_TOOLTIP:
+				setHasTooltip(HAS_TOOLTIP_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_CATEGORY__TOOLTIP:
+				setTooltip(TOOLTIP_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MenuDslPackage.MENU_CATEGORY__TREES:
+				return trees != null && !trees.isEmpty();
+			case MenuDslPackage.MENU_CATEGORY__HAS_TABLE:
+				return hasTable != HAS_TABLE_EDEFAULT;
+			case MenuDslPackage.MENU_CATEGORY__TABLE:
+				return table != null;
+			case MenuDslPackage.MENU_CATEGORY__HAS_DIALOG:
+				return hasDialog != HAS_DIALOG_EDEFAULT;
+			case MenuDslPackage.MENU_CATEGORY__DIALOG:
+				return dialog != null;
+			case MenuDslPackage.MENU_CATEGORY__HAS_USER_FILTER:
+				return hasUserFilter != HAS_USER_FILTER_EDEFAULT;
+			case MenuDslPackage.MENU_CATEGORY__HAS_REPORT_PRINTER:
+				return hasReportPrinter != HAS_REPORT_PRINTER_EDEFAULT;
+			case MenuDslPackage.MENU_CATEGORY__HAS_KEY_BINDING:
+				return hasKeyBinding != HAS_KEY_BINDING_EDEFAULT;
+			case MenuDslPackage.MENU_CATEGORY__HAS_SYSTEM_SETTINGS:
+				return hasSystemSettings != HAS_SYSTEM_SETTINGS_EDEFAULT;
+			case MenuDslPackage.MENU_CATEGORY__HAS_TOOLTIP:
+				return hasTooltip != HAS_TOOLTIP_EDEFAULT;
+			case MenuDslPackage.MENU_CATEGORY__TOOLTIP:
+				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
+		}
+		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(" (hasTable: ");
+		result.append(hasTable);
+		result.append(", hasDialog: ");
+		result.append(hasDialog);
+		result.append(", hasUserFilter: ");
+		result.append(hasUserFilter);
+		result.append(", hasReportPrinter: ");
+		result.append(hasReportPrinter);
+		result.append(", hasKeyBinding: ");
+		result.append(hasKeyBinding);
+		result.append(", hasSystemSettings: ");
+		result.append(hasSystemSettings);
+		result.append(", hasTooltip: ");
+		result.append(hasTooltip);
+		result.append(", tooltip: ");
+		result.append(tooltip);
+		result.append(')');
+		return result.toString();
+	}
+
+} //MenuCategoryImpl
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslFactoryImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslFactoryImpl.java
index 35adc84..7144398 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslFactoryImpl.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslFactoryImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -68,8 +70,9 @@ public class MenuDslFactoryImpl extends EFactoryImpl implements MenuDslFactory {
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
 			case MenuDslPackage.MENU_MODEL: return createMenuModel();
-			case MenuDslPackage.MENU_LAZY_RESOLVER: return createMenuLazyResolver();
 			case MenuDslPackage.MENU_PACKAGE: return createMenuPackage();
+			case MenuDslPackage.MENU_CATEGORY: return createMenuCategory();
+			case MenuDslPackage.MENU_TREE: return createMenuTree();
 			case MenuDslPackage.MENU_ENTRY: return createMenuEntry();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
@@ -121,9 +124,9 @@ public class MenuDslFactoryImpl extends EFactoryImpl implements MenuDslFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public MenuLazyResolver createMenuLazyResolver() {
-		MenuLazyResolverImpl menuLazyResolver = new MenuLazyResolverImpl();
-		return menuLazyResolver;
+	public MenuPackage createMenuPackage() {
+		MenuPackageImpl menuPackage = new MenuPackageImpl();
+		return menuPackage;
 	}
 
 	/**
@@ -131,9 +134,19 @@ public class MenuDslFactoryImpl extends EFactoryImpl implements MenuDslFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public MenuPackage createMenuPackage() {
-		MenuPackageImpl menuPackage = new MenuPackageImpl();
-		return menuPackage;
+	public MenuCategory createMenuCategory() {
+		MenuCategoryImpl menuCategory = new MenuCategoryImpl();
+		return menuCategory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MenuTree createMenuTree() {
+		MenuTreeImpl menuTree = new MenuTreeImpl();
+		return menuTree;
 	}
 
 	/**
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslPackageImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslPackageImpl.java
index bed6ead..b9daee4 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslPackageImpl.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuDslPackageImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -14,7 +16,6 @@ package org.eclipse.osbp.xtext.menu.impl;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
@@ -28,12 +29,13 @@ import org.eclipse.osbp.xtext.blip.BlipDSLPackage;
 
 import org.eclipse.osbp.xtext.dialogdsl.DialogDSLPackage;
 
+import org.eclipse.osbp.xtext.menu.MenuCategory;
 import org.eclipse.osbp.xtext.menu.MenuDslFactory;
 import org.eclipse.osbp.xtext.menu.MenuDslPackage;
 import org.eclipse.osbp.xtext.menu.MenuEntry;
-import org.eclipse.osbp.xtext.menu.MenuLazyResolver;
 import org.eclipse.osbp.xtext.menu.MenuModel;
 import org.eclipse.osbp.xtext.menu.MenuPackage;
+import org.eclipse.osbp.xtext.menu.MenuTree;
 
 import org.eclipse.osbp.xtext.perspective.PerspectiveDslPackage;
 
@@ -60,14 +62,21 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass menuLazyResolverEClass = null;
+	private EClass menuPackageEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass menuPackageEClass = null;
+	private EClass menuCategoryEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass menuTreeEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -170,7 +179,7 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMenuModel_Packages() {
+	public EReference getMenuModel_Menupackage() {
 		return (EReference)menuModelEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -179,8 +188,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getMenuLazyResolver() {
-		return menuLazyResolverEClass;
+	public EClass getMenuPackage() {
+		return menuPackageEClass;
 	}
 
 	/**
@@ -188,8 +197,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getMenuLazyResolver__EResolveProxy__InternalEObject() {
-		return menuLazyResolverEClass.getEOperations().get(0);
+	public EReference getMenuPackage_Categories() {
+		return (EReference)menuPackageEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -197,8 +206,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getMenuPackage() {
-		return menuPackageEClass;
+	public EAttribute getMenuPackage_ExpandedImage() {
+		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -206,8 +215,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMenuPackage_Entries() {
-		return (EReference)menuPackageEClass.getEStructuralFeatures().get(0);
+	public EAttribute getMenuPackage_CollapsedImage() {
+		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -215,8 +224,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuPackage_SubMenuIsAccordion() {
-		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(1);
+	public EAttribute getMenuPackage_Width() {
+		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -224,8 +233,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuPackage_ExpandedImage() {
-		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(2);
+	public EAttribute getMenuPackage_Height() {
+		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -233,8 +242,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuPackage_CollapsedImage() {
-		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(3);
+	public EAttribute getMenuPackage_HasDesigner() {
+		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -242,8 +251,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuPackage_Width() {
-		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(4);
+	public EClass getMenuCategory() {
+		return menuCategoryEClass;
 	}
 
 	/**
@@ -251,8 +260,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuPackage_Height() {
-		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(5);
+	public EReference getMenuCategory_Trees() {
+		return (EReference)menuCategoryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -260,8 +269,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuPackage_HasDesigner() {
-		return (EAttribute)menuPackageEClass.getEStructuralFeatures().get(6);
+	public EAttribute getMenuCategory_HasTable() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -269,8 +278,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getMenuEntry() {
-		return menuEntryEClass;
+	public EReference getMenuCategory_Table() {
+		return (EReference)menuCategoryEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -278,8 +287,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_Entryid() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(0);
+	public EAttribute getMenuCategory_HasDialog() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -287,8 +296,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_HasImage() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(1);
+	public EReference getMenuCategory_Dialog() {
+		return (EReference)menuCategoryEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -296,8 +305,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_Image() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(2);
+	public EAttribute getMenuCategory_HasUserFilter() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -305,8 +314,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_Description() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(3);
+	public EAttribute getMenuCategory_HasReportPrinter() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -314,8 +323,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_DescriptionValue() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(4);
+	public EAttribute getMenuCategory_HasKeyBinding() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -323,8 +332,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMenuEntry_Subentries() {
-		return (EReference)menuEntryEClass.getEStructuralFeatures().get(5);
+	public EAttribute getMenuCategory_HasSystemSettings() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -332,8 +341,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_HasProcess() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(6);
+	public EAttribute getMenuCategory_HasTooltip() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -341,8 +350,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMenuEntry_Process() {
-		return (EReference)menuEntryEClass.getEStructuralFeatures().get(7);
+	public EAttribute getMenuCategory_Tooltip() {
+		return (EAttribute)menuCategoryEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -350,8 +359,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_HasPerspective() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(8);
+	public EClass getMenuTree() {
+		return menuTreeEClass;
 	}
 
 	/**
@@ -359,8 +368,17 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMenuEntry_Perspective() {
-		return (EReference)menuEntryEClass.getEStructuralFeatures().get(9);
+	public EAttribute getMenuTree_HasTooltip() {
+		return (EAttribute)menuTreeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getMenuTree_Tooltip() {
+		return (EAttribute)menuTreeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -368,8 +386,17 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_ShowBadge() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(10);
+	public EReference getMenuTree_Entries() {
+		return (EReference)menuTreeEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getMenuEntry() {
+		return menuEntryEClass;
 	}
 
 	/**
@@ -377,8 +404,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_HasTable() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(11);
+	public EAttribute getMenuEntry_HasIcon() {
+		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -386,8 +413,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMenuEntry_Table() {
-		return (EReference)menuEntryEClass.getEStructuralFeatures().get(12);
+	public EAttribute getMenuEntry_Icon() {
+		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -395,8 +422,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_HasDialog() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(13);
+	public EAttribute getMenuEntry_HasTooltip() {
+		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -404,8 +431,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMenuEntry_Dialog() {
-		return (EReference)menuEntryEClass.getEStructuralFeatures().get(14);
+	public EAttribute getMenuEntry_Tooltip() {
+		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -413,8 +440,8 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_HasUserFilter() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(15);
+	public EAttribute getMenuEntry_HasProcess() {
+		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -422,8 +449,26 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMenuEntry_HasKeyBinding() {
-		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(16);
+	public EReference getMenuEntry_Process() {
+		return (EReference)menuEntryEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getMenuEntry_HasPerspective() {
+		return (EAttribute)menuEntryEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getMenuEntry_Perspective() {
+		return (EReference)menuEntryEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -465,38 +510,43 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 		// Create classes and their features
 		menuModelEClass = createEClass(MENU_MODEL);
 		createEReference(menuModelEClass, MENU_MODEL__IMPORT_SECTION);
-		createEReference(menuModelEClass, MENU_MODEL__PACKAGES);
-
-		menuLazyResolverEClass = createEClass(MENU_LAZY_RESOLVER);
-		createEOperation(menuLazyResolverEClass, MENU_LAZY_RESOLVER___ERESOLVE_PROXY__INTERNALEOBJECT);
+		createEReference(menuModelEClass, MENU_MODEL__MENUPACKAGE);
 
 		menuPackageEClass = createEClass(MENU_PACKAGE);
-		createEReference(menuPackageEClass, MENU_PACKAGE__ENTRIES);
-		createEAttribute(menuPackageEClass, MENU_PACKAGE__SUB_MENU_IS_ACCORDION);
+		createEReference(menuPackageEClass, MENU_PACKAGE__CATEGORIES);
 		createEAttribute(menuPackageEClass, MENU_PACKAGE__EXPANDED_IMAGE);
 		createEAttribute(menuPackageEClass, MENU_PACKAGE__COLLAPSED_IMAGE);
 		createEAttribute(menuPackageEClass, MENU_PACKAGE__WIDTH);
 		createEAttribute(menuPackageEClass, MENU_PACKAGE__HEIGHT);
 		createEAttribute(menuPackageEClass, MENU_PACKAGE__HAS_DESIGNER);
 
+		menuCategoryEClass = createEClass(MENU_CATEGORY);
+		createEReference(menuCategoryEClass, MENU_CATEGORY__TREES);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__HAS_TABLE);
+		createEReference(menuCategoryEClass, MENU_CATEGORY__TABLE);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__HAS_DIALOG);
+		createEReference(menuCategoryEClass, MENU_CATEGORY__DIALOG);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__HAS_USER_FILTER);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__HAS_REPORT_PRINTER);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__HAS_KEY_BINDING);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__HAS_SYSTEM_SETTINGS);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__HAS_TOOLTIP);
+		createEAttribute(menuCategoryEClass, MENU_CATEGORY__TOOLTIP);
+
+		menuTreeEClass = createEClass(MENU_TREE);
+		createEAttribute(menuTreeEClass, MENU_TREE__HAS_TOOLTIP);
+		createEAttribute(menuTreeEClass, MENU_TREE__TOOLTIP);
+		createEReference(menuTreeEClass, MENU_TREE__ENTRIES);
+
 		menuEntryEClass = createEClass(MENU_ENTRY);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__ENTRYID);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_IMAGE);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__IMAGE);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__DESCRIPTION);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__DESCRIPTION_VALUE);
-		createEReference(menuEntryEClass, MENU_ENTRY__SUBENTRIES);
+		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_ICON);
+		createEAttribute(menuEntryEClass, MENU_ENTRY__ICON);
+		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_TOOLTIP);
+		createEAttribute(menuEntryEClass, MENU_ENTRY__TOOLTIP);
 		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_PROCESS);
 		createEReference(menuEntryEClass, MENU_ENTRY__PROCESS);
 		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_PERSPECTIVE);
 		createEReference(menuEntryEClass, MENU_ENTRY__PERSPECTIVE);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__SHOW_BADGE);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_TABLE);
-		createEReference(menuEntryEClass, MENU_ENTRY__TABLE);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_DIALOG);
-		createEReference(menuEntryEClass, MENU_ENTRY__DIALOG);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_USER_FILTER);
-		createEAttribute(menuEntryEClass, MENU_ENTRY__HAS_KEY_BINDING);
 
 		// Create data types
 		internalEObjectEDataType = createEDataType(INTERNAL_EOBJECT);
@@ -527,12 +577,12 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 
 		// Obtain other dependent packages
 		XtypePackage theXtypePackage = (XtypePackage)EPackage.Registry.INSTANCE.getEPackage(XtypePackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		OSBPTypesPackage theOSBPTypesPackage = (OSBPTypesPackage)EPackage.Registry.INSTANCE.getEPackage(OSBPTypesPackage.eNS_URI);
-		BlipDSLPackage theBlipDSLPackage = (BlipDSLPackage)EPackage.Registry.INSTANCE.getEPackage(BlipDSLPackage.eNS_URI);
-		PerspectiveDslPackage thePerspectiveDslPackage = (PerspectiveDslPackage)EPackage.Registry.INSTANCE.getEPackage(PerspectiveDslPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		TableDSLPackage theTableDSLPackage = (TableDSLPackage)EPackage.Registry.INSTANCE.getEPackage(TableDSLPackage.eNS_URI);
 		DialogDSLPackage theDialogDSLPackage = (DialogDSLPackage)EPackage.Registry.INSTANCE.getEPackage(DialogDSLPackage.eNS_URI);
+		BlipDSLPackage theBlipDSLPackage = (BlipDSLPackage)EPackage.Registry.INSTANCE.getEPackage(BlipDSLPackage.eNS_URI);
+		PerspectiveDslPackage thePerspectiveDslPackage = (PerspectiveDslPackage)EPackage.Registry.INSTANCE.getEPackage(PerspectiveDslPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -540,45 +590,50 @@ public class MenuDslPackageImpl extends EPackageImpl implements MenuDslPackage {
 
 		// Add supertypes to classes
 		menuPackageEClass.getESuperTypes().add(theOSBPTypesPackage.getLPackage());
-		menuEntryEClass.getESuperTypes().add(this.getMenuLazyResolver());
+		menuCategoryEClass.getESuperTypes().add(theOSBPTypesPackage.getLPackage());
+		menuTreeEClass.getESuperTypes().add(theOSBPTypesPackage.getLPackage());
+		menuEntryEClass.getESuperTypes().add(theOSBPTypesPackage.getLPackage());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(menuModelEClass, MenuModel.class, "MenuModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMenuModel_ImportSection(), theXtypePackage.getXImportSection(), null, "importSection", null, 0, 1, MenuModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMenuModel_Packages(), this.getMenuPackage(), null, "packages", null, 0, -1, MenuModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(menuLazyResolverEClass, MenuLazyResolver.class, "MenuLazyResolver", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		EOperation op = initEOperation(getMenuLazyResolver__EResolveProxy__InternalEObject(), theEcorePackage.getEObject(), "eResolveProxy", 0, 1, !IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, this.getInternalEObject(), "proxy", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		initEReference(getMenuModel_Menupackage(), this.getMenuPackage(), null, "menupackage", null, 0, 1, MenuModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(menuPackageEClass, MenuPackage.class, "MenuPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMenuPackage_Entries(), this.getMenuEntry(), null, "entries", null, 0, -1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuPackage_SubMenuIsAccordion(), theEcorePackage.getEBoolean(), "subMenuIsAccordion", null, 0, 1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMenuPackage_Categories(), this.getMenuCategory(), null, "categories", null, 0, -1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMenuPackage_ExpandedImage(), theEcorePackage.getEString(), "expandedImage", null, 0, 1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMenuPackage_CollapsedImage(), theEcorePackage.getEString(), "collapsedImage", null, 0, 1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMenuPackage_Width(), theEcorePackage.getEString(), "width", null, 0, 1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMenuPackage_Height(), theEcorePackage.getEString(), "height", null, 0, 1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMenuPackage_HasDesigner(), theEcorePackage.getEBoolean(), "hasDesigner", null, 0, 1, MenuPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(menuCategoryEClass, MenuCategory.class, "MenuCategory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMenuCategory_Trees(), this.getMenuTree(), null, "trees", null, 0, -1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_HasTable(), theEcorePackage.getEBoolean(), "hasTable", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMenuCategory_Table(), theTableDSLPackage.getTable(), null, "table", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_HasDialog(), theEcorePackage.getEBoolean(), "hasDialog", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMenuCategory_Dialog(), theDialogDSLPackage.getDialog(), null, "dialog", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_HasUserFilter(), theEcorePackage.getEBoolean(), "hasUserFilter", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_HasReportPrinter(), theEcorePackage.getEBoolean(), "hasReportPrinter", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_HasKeyBinding(), theEcorePackage.getEBoolean(), "hasKeyBinding", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_HasSystemSettings(), theEcorePackage.getEBoolean(), "hasSystemSettings", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_HasTooltip(), theEcorePackage.getEBoolean(), "hasTooltip", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuCategory_Tooltip(), theEcorePackage.getEString(), "tooltip", null, 0, 1, MenuCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(menuTreeEClass, MenuTree.class, "MenuTree", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMenuTree_HasTooltip(), theEcorePackage.getEBoolean(), "hasTooltip", null, 0, 1, MenuTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuTree_Tooltip(), theEcorePackage.getEString(), "tooltip", null, 0, 1, MenuTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMenuTree_Entries(), this.getMenuEntry(), null, "entries", null, 0, -1, MenuTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(menuEntryEClass, MenuEntry.class, "MenuEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMenuEntry_Entryid(), theEcorePackage.getEString(), "entryid", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_HasImage(), theEcorePackage.getEBoolean(), "hasImage", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_Image(), theEcorePackage.getEString(), "image", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_Description(), theEcorePackage.getEBoolean(), "description", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_DescriptionValue(), theEcorePackage.getEString(), "descriptionValue", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMenuEntry_Subentries(), this.getMenuEntry(), null, "subentries", null, 0, -1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuEntry_HasIcon(), theEcorePackage.getEBoolean(), "hasIcon", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuEntry_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuEntry_HasTooltip(), theEcorePackage.getEBoolean(), "hasTooltip", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMenuEntry_Tooltip(), theEcorePackage.getEString(), "tooltip", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMenuEntry_HasProcess(), theEcorePackage.getEBoolean(), "hasProcess", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getMenuEntry_Process(), theBlipDSLPackage.getBlip(), null, "process", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMenuEntry_HasPerspective(), theEcorePackage.getEBoolean(), "hasPerspective", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getMenuEntry_Perspective(), thePerspectiveDslPackage.getPerspective(), null, "perspective", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_ShowBadge(), theEcorePackage.getEBoolean(), "showBadge", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_HasTable(), theEcorePackage.getEBoolean(), "hasTable", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMenuEntry_Table(), theTableDSLPackage.getTable(), null, "table", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_HasDialog(), theEcorePackage.getEBoolean(), "hasDialog", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMenuEntry_Dialog(), theDialogDSLPackage.getDialog(), null, "dialog", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_HasUserFilter(), theEcorePackage.getEBoolean(), "hasUserFilter", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMenuEntry_HasKeyBinding(), theEcorePackage.getEBoolean(), "hasKeyBinding", null, 0, 1, MenuEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Initialize data types
 		initEDataType(internalEObjectEDataType, InternalEObject.class, "InternalEObject", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuEntryImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuEntryImpl.java
index 912e964..c9af62b 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuEntryImpl.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuEntryImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -11,32 +13,22 @@
  */
 package org.eclipse.osbp.xtext.menu.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.dsl.semantic.common.types.impl.LPackageImpl;
 
 import org.eclipse.osbp.xtext.blip.Blip;
 
-import org.eclipse.osbp.xtext.dialogdsl.Dialog;
-
 import org.eclipse.osbp.xtext.menu.MenuDslPackage;
 import org.eclipse.osbp.xtext.menu.MenuEntry;
 
 import org.eclipse.osbp.xtext.perspective.Perspective;
 
-import org.eclipse.osbp.xtext.table.Table;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Menu Entry</b></em>'.
@@ -45,137 +37,98 @@ import org.eclipse.osbp.xtext.table.Table;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getEntryid <em>Entryid</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasImage <em>Has Image</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getImage <em>Image</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getDescriptionValue <em>Description Value</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getSubentries <em>Subentries</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasIcon <em>Has Icon</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasTooltip <em>Has Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getTooltip <em>Tooltip</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasProcess <em>Has Process</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getProcess <em>Process</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasPerspective <em>Has Perspective</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getPerspective <em>Perspective</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isShowBadge <em>Show Badge</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasTable <em>Has Table</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasDialog <em>Has Dialog</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#getDialog <em>Dialog</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasUserFilter <em>Has User Filter</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuEntryImpl#isHasKeyBinding <em>Has Key Binding</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
-	/**
-	 * The default value of the '{@link #getEntryid() <em>Entryid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntryid()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ENTRYID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEntryid() <em>Entryid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntryid()
-	 * @generated
-	 * @ordered
-	 */
-	protected String entryid = ENTRYID_EDEFAULT;
-
+public class MenuEntryImpl extends LPackageImpl implements MenuEntry {
 	/**
-	 * The default value of the '{@link #isHasImage() <em>Has Image</em>}' attribute.
+	 * The default value of the '{@link #isHasIcon() <em>Has Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isHasImage()
+	 * @see #isHasIcon()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean HAS_IMAGE_EDEFAULT = false;
+	protected static final boolean HAS_ICON_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isHasImage() <em>Has Image</em>}' attribute.
+	 * The cached value of the '{@link #isHasIcon() <em>Has Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isHasImage()
+	 * @see #isHasIcon()
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean hasImage = HAS_IMAGE_EDEFAULT;
+	protected boolean hasIcon = HAS_ICON_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getImage() <em>Image</em>}' attribute.
+	 * The default value of the '{@link #getIcon() <em>Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getImage()
+	 * @see #getIcon()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String IMAGE_EDEFAULT = null;
+	protected static final String ICON_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getImage() <em>Image</em>}' attribute.
+	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getImage()
+	 * @see #getIcon()
 	 * @generated
 	 * @ordered
 	 */
-	protected String image = IMAGE_EDEFAULT;
+	protected String icon = ICON_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isDescription() <em>Description</em>}' attribute.
+	 * The default value of the '{@link #isHasTooltip() <em>Has Tooltip</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isDescription()
+	 * @see #isHasTooltip()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean DESCRIPTION_EDEFAULT = false;
+	protected static final boolean HAS_TOOLTIP_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDescription() <em>Description</em>}' attribute.
+	 * The cached value of the '{@link #isHasTooltip() <em>Has Tooltip</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isDescription()
+	 * @see #isHasTooltip()
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean description = DESCRIPTION_EDEFAULT;
+	protected boolean hasTooltip = HAS_TOOLTIP_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDescriptionValue() <em>Description Value</em>}' attribute.
+	 * The default value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDescriptionValue()
+	 * @see #getTooltip()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String DESCRIPTION_VALUE_EDEFAULT = null;
+	protected static final String TOOLTIP_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDescriptionValue() <em>Description Value</em>}' attribute.
+	 * The cached value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDescriptionValue()
+	 * @see #getTooltip()
 	 * @generated
 	 * @ordered
 	 */
-	protected String descriptionValue = DESCRIPTION_VALUE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSubentries() <em>Subentries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubentries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MenuEntry> subentries;
+	protected String tooltip = TOOLTIP_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #isHasProcess() <em>Has Process</em>}' attribute.
@@ -238,126 +191,6 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	protected Perspective perspective;
 
 	/**
-	 * The default value of the '{@link #isShowBadge() <em>Show Badge</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isShowBadge()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SHOW_BADGE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isShowBadge() <em>Show Badge</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isShowBadge()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean showBadge = SHOW_BADGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isHasTable() <em>Has Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HAS_TABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHasTable() <em>Has Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasTable = HAS_TABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTable() <em>Table</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Table table;
-
-	/**
-	 * The default value of the '{@link #isHasDialog() <em>Has Dialog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasDialog()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HAS_DIALOG_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHasDialog() <em>Has Dialog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasDialog()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasDialog = HAS_DIALOG_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDialog() <em>Dialog</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDialog()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dialog dialog;
-
-	/**
-	 * The default value of the '{@link #isHasUserFilter() <em>Has User Filter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasUserFilter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HAS_USER_FILTER_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHasUserFilter() <em>Has User Filter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasUserFilter()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasUserFilter = HAS_USER_FILTER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isHasKeyBinding() <em>Has Key Binding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasKeyBinding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HAS_KEY_BINDING_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHasKeyBinding() <em>Has Key Binding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHasKeyBinding()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hasKeyBinding = HAS_KEY_BINDING_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -381,20 +214,8 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getEntryid() {
-		return entryid;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEntryid(String newEntryid) {
-		String oldEntryid = entryid;
-		entryid = newEntryid;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__ENTRYID, oldEntryid, entryid));
+	public boolean isHasIcon() {
+		return hasIcon;
 	}
 
 	/**
@@ -402,20 +223,11 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isHasImage() {
-		return hasImage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasImage(boolean newHasImage) {
-		boolean oldHasImage = hasImage;
-		hasImage = newHasImage;
+	public void setHasIcon(boolean newHasIcon) {
+		boolean oldHasIcon = hasIcon;
+		hasIcon = newHasIcon;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__HAS_IMAGE, oldHasImage, hasImage));
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__HAS_ICON, oldHasIcon, hasIcon));
 	}
 
 	/**
@@ -423,8 +235,8 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getImage() {
-		return image;
+	public String getIcon() {
+		return icon;
 	}
 
 	/**
@@ -432,11 +244,11 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setImage(String newImage) {
-		String oldImage = image;
-		image = newImage;
+	public void setIcon(String newIcon) {
+		String oldIcon = icon;
+		icon = newIcon;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__IMAGE, oldImage, image));
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__ICON, oldIcon, icon));
 	}
 
 	/**
@@ -444,8 +256,8 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isDescription() {
-		return description;
+	public boolean isHasTooltip() {
+		return hasTooltip;
 	}
 
 	/**
@@ -453,11 +265,11 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setDescription(boolean newDescription) {
-		boolean oldDescription = description;
-		description = newDescription;
+	public void setHasTooltip(boolean newHasTooltip) {
+		boolean oldHasTooltip = hasTooltip;
+		hasTooltip = newHasTooltip;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__HAS_TOOLTIP, oldHasTooltip, hasTooltip));
 	}
 
 	/**
@@ -465,8 +277,8 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getDescriptionValue() {
-		return descriptionValue;
+	public String getTooltip() {
+		return tooltip;
 	}
 
 	/**
@@ -474,23 +286,11 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setDescriptionValue(String newDescriptionValue) {
-		String oldDescriptionValue = descriptionValue;
-		descriptionValue = newDescriptionValue;
+	public void setTooltip(String newTooltip) {
+		String oldTooltip = tooltip;
+		tooltip = newTooltip;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__DESCRIPTION_VALUE, oldDescriptionValue, descriptionValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<MenuEntry> getSubentries() {
-		if (subentries == null) {
-			subentries = new EObjectContainmentEList<MenuEntry>(MenuEntry.class, this, MenuDslPackage.MENU_ENTRY__SUBENTRIES);
-		}
-		return subentries;
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__TOOLTIP, oldTooltip, tooltip));
 	}
 
 	/**
@@ -616,216 +416,17 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isShowBadge() {
-		return showBadge;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setShowBadge(boolean newShowBadge) {
-		boolean oldShowBadge = showBadge;
-		showBadge = newShowBadge;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__SHOW_BADGE, oldShowBadge, showBadge));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHasTable() {
-		return hasTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasTable(boolean newHasTable) {
-		boolean oldHasTable = hasTable;
-		hasTable = newHasTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__HAS_TABLE, oldHasTable, hasTable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Table getTable() {
-		if (table != null && table.eIsProxy()) {
-			InternalEObject oldTable = (InternalEObject)table;
-			table = (Table)eResolveProxy(oldTable);
-			if (table != oldTable) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MenuDslPackage.MENU_ENTRY__TABLE, oldTable, table));
-			}
-		}
-		return table;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Table basicGetTable() {
-		return table;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTable(Table newTable) {
-		Table oldTable = table;
-		table = newTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__TABLE, oldTable, table));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHasDialog() {
-		return hasDialog;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasDialog(boolean newHasDialog) {
-		boolean oldHasDialog = hasDialog;
-		hasDialog = newHasDialog;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__HAS_DIALOG, oldHasDialog, hasDialog));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dialog getDialog() {
-		if (dialog != null && dialog.eIsProxy()) {
-			InternalEObject oldDialog = (InternalEObject)dialog;
-			dialog = (Dialog)eResolveProxy(oldDialog);
-			if (dialog != oldDialog) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MenuDslPackage.MENU_ENTRY__DIALOG, oldDialog, dialog));
-			}
-		}
-		return dialog;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dialog basicGetDialog() {
-		return dialog;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDialog(Dialog newDialog) {
-		Dialog oldDialog = dialog;
-		dialog = newDialog;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__DIALOG, oldDialog, dialog));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHasUserFilter() {
-		return hasUserFilter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasUserFilter(boolean newHasUserFilter) {
-		boolean oldHasUserFilter = hasUserFilter;
-		hasUserFilter = newHasUserFilter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__HAS_USER_FILTER, oldHasUserFilter, hasUserFilter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHasKeyBinding() {
-		return hasKeyBinding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHasKeyBinding(boolean newHasKeyBinding) {
-		boolean oldHasKeyBinding = hasKeyBinding;
-		hasKeyBinding = newHasKeyBinding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_ENTRY__HAS_KEY_BINDING, oldHasKeyBinding, hasKeyBinding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MenuDslPackage.MENU_ENTRY__SUBENTRIES:
-				return ((InternalEList<?>)getSubentries()).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 MenuDslPackage.MENU_ENTRY__ENTRYID:
-				return getEntryid();
-			case MenuDslPackage.MENU_ENTRY__HAS_IMAGE:
-				return isHasImage();
-			case MenuDslPackage.MENU_ENTRY__IMAGE:
-				return getImage();
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION:
-				return isDescription();
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION_VALUE:
-				return getDescriptionValue();
-			case MenuDslPackage.MENU_ENTRY__SUBENTRIES:
-				return getSubentries();
+			case MenuDslPackage.MENU_ENTRY__HAS_ICON:
+				return isHasIcon();
+			case MenuDslPackage.MENU_ENTRY__ICON:
+				return getIcon();
+			case MenuDslPackage.MENU_ENTRY__HAS_TOOLTIP:
+				return isHasTooltip();
+			case MenuDslPackage.MENU_ENTRY__TOOLTIP:
+				return getTooltip();
 			case MenuDslPackage.MENU_ENTRY__HAS_PROCESS:
 				return isHasProcess();
 			case MenuDslPackage.MENU_ENTRY__PROCESS:
@@ -836,22 +437,6 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 			case MenuDslPackage.MENU_ENTRY__PERSPECTIVE:
 				if (resolve) return getPerspective();
 				return basicGetPerspective();
-			case MenuDslPackage.MENU_ENTRY__SHOW_BADGE:
-				return isShowBadge();
-			case MenuDslPackage.MENU_ENTRY__HAS_TABLE:
-				return isHasTable();
-			case MenuDslPackage.MENU_ENTRY__TABLE:
-				if (resolve) return getTable();
-				return basicGetTable();
-			case MenuDslPackage.MENU_ENTRY__HAS_DIALOG:
-				return isHasDialog();
-			case MenuDslPackage.MENU_ENTRY__DIALOG:
-				if (resolve) return getDialog();
-				return basicGetDialog();
-			case MenuDslPackage.MENU_ENTRY__HAS_USER_FILTER:
-				return isHasUserFilter();
-			case MenuDslPackage.MENU_ENTRY__HAS_KEY_BINDING:
-				return isHasKeyBinding();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -861,28 +446,20 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_ENTRY__ENTRYID:
-				setEntryid((String)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_IMAGE:
-				setHasImage((Boolean)newValue);
+			case MenuDslPackage.MENU_ENTRY__HAS_ICON:
+				setHasIcon((Boolean)newValue);
 				return;
-			case MenuDslPackage.MENU_ENTRY__IMAGE:
-				setImage((String)newValue);
+			case MenuDslPackage.MENU_ENTRY__ICON:
+				setIcon((String)newValue);
 				return;
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION:
-				setDescription((Boolean)newValue);
+			case MenuDslPackage.MENU_ENTRY__HAS_TOOLTIP:
+				setHasTooltip((Boolean)newValue);
 				return;
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION_VALUE:
-				setDescriptionValue((String)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__SUBENTRIES:
-				getSubentries().clear();
-				getSubentries().addAll((Collection<? extends MenuEntry>)newValue);
+			case MenuDslPackage.MENU_ENTRY__TOOLTIP:
+				setTooltip((String)newValue);
 				return;
 			case MenuDslPackage.MENU_ENTRY__HAS_PROCESS:
 				setHasProcess((Boolean)newValue);
@@ -896,27 +473,6 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 			case MenuDslPackage.MENU_ENTRY__PERSPECTIVE:
 				setPerspective((Perspective)newValue);
 				return;
-			case MenuDslPackage.MENU_ENTRY__SHOW_BADGE:
-				setShowBadge((Boolean)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_TABLE:
-				setHasTable((Boolean)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__TABLE:
-				setTable((Table)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_DIALOG:
-				setHasDialog((Boolean)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__DIALOG:
-				setDialog((Dialog)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_USER_FILTER:
-				setHasUserFilter((Boolean)newValue);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_KEY_BINDING:
-				setHasKeyBinding((Boolean)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -929,23 +485,17 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_ENTRY__ENTRYID:
-				setEntryid(ENTRYID_EDEFAULT);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_IMAGE:
-				setHasImage(HAS_IMAGE_EDEFAULT);
+			case MenuDslPackage.MENU_ENTRY__HAS_ICON:
+				setHasIcon(HAS_ICON_EDEFAULT);
 				return;
-			case MenuDslPackage.MENU_ENTRY__IMAGE:
-				setImage(IMAGE_EDEFAULT);
+			case MenuDslPackage.MENU_ENTRY__ICON:
+				setIcon(ICON_EDEFAULT);
 				return;
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
+			case MenuDslPackage.MENU_ENTRY__HAS_TOOLTIP:
+				setHasTooltip(HAS_TOOLTIP_EDEFAULT);
 				return;
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION_VALUE:
-				setDescriptionValue(DESCRIPTION_VALUE_EDEFAULT);
-				return;
-			case MenuDslPackage.MENU_ENTRY__SUBENTRIES:
-				getSubentries().clear();
+			case MenuDslPackage.MENU_ENTRY__TOOLTIP:
+				setTooltip(TOOLTIP_EDEFAULT);
 				return;
 			case MenuDslPackage.MENU_ENTRY__HAS_PROCESS:
 				setHasProcess(HAS_PROCESS_EDEFAULT);
@@ -959,27 +509,6 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 			case MenuDslPackage.MENU_ENTRY__PERSPECTIVE:
 				setPerspective((Perspective)null);
 				return;
-			case MenuDslPackage.MENU_ENTRY__SHOW_BADGE:
-				setShowBadge(SHOW_BADGE_EDEFAULT);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_TABLE:
-				setHasTable(HAS_TABLE_EDEFAULT);
-				return;
-			case MenuDslPackage.MENU_ENTRY__TABLE:
-				setTable((Table)null);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_DIALOG:
-				setHasDialog(HAS_DIALOG_EDEFAULT);
-				return;
-			case MenuDslPackage.MENU_ENTRY__DIALOG:
-				setDialog((Dialog)null);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_USER_FILTER:
-				setHasUserFilter(HAS_USER_FILTER_EDEFAULT);
-				return;
-			case MenuDslPackage.MENU_ENTRY__HAS_KEY_BINDING:
-				setHasKeyBinding(HAS_KEY_BINDING_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -992,18 +521,14 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_ENTRY__ENTRYID:
-				return ENTRYID_EDEFAULT == null ? entryid != null : !ENTRYID_EDEFAULT.equals(entryid);
-			case MenuDslPackage.MENU_ENTRY__HAS_IMAGE:
-				return hasImage != HAS_IMAGE_EDEFAULT;
-			case MenuDslPackage.MENU_ENTRY__IMAGE:
-				return IMAGE_EDEFAULT == null ? image != null : !IMAGE_EDEFAULT.equals(image);
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION:
-				return description != DESCRIPTION_EDEFAULT;
-			case MenuDslPackage.MENU_ENTRY__DESCRIPTION_VALUE:
-				return DESCRIPTION_VALUE_EDEFAULT == null ? descriptionValue != null : !DESCRIPTION_VALUE_EDEFAULT.equals(descriptionValue);
-			case MenuDslPackage.MENU_ENTRY__SUBENTRIES:
-				return subentries != null && !subentries.isEmpty();
+			case MenuDslPackage.MENU_ENTRY__HAS_ICON:
+				return hasIcon != HAS_ICON_EDEFAULT;
+			case MenuDslPackage.MENU_ENTRY__ICON:
+				return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);
+			case MenuDslPackage.MENU_ENTRY__HAS_TOOLTIP:
+				return hasTooltip != HAS_TOOLTIP_EDEFAULT;
+			case MenuDslPackage.MENU_ENTRY__TOOLTIP:
+				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
 			case MenuDslPackage.MENU_ENTRY__HAS_PROCESS:
 				return hasProcess != HAS_PROCESS_EDEFAULT;
 			case MenuDslPackage.MENU_ENTRY__PROCESS:
@@ -1012,20 +537,6 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 				return hasPerspective != HAS_PERSPECTIVE_EDEFAULT;
 			case MenuDslPackage.MENU_ENTRY__PERSPECTIVE:
 				return perspective != null;
-			case MenuDslPackage.MENU_ENTRY__SHOW_BADGE:
-				return showBadge != SHOW_BADGE_EDEFAULT;
-			case MenuDslPackage.MENU_ENTRY__HAS_TABLE:
-				return hasTable != HAS_TABLE_EDEFAULT;
-			case MenuDslPackage.MENU_ENTRY__TABLE:
-				return table != null;
-			case MenuDslPackage.MENU_ENTRY__HAS_DIALOG:
-				return hasDialog != HAS_DIALOG_EDEFAULT;
-			case MenuDslPackage.MENU_ENTRY__DIALOG:
-				return dialog != null;
-			case MenuDslPackage.MENU_ENTRY__HAS_USER_FILTER:
-				return hasUserFilter != HAS_USER_FILTER_EDEFAULT;
-			case MenuDslPackage.MENU_ENTRY__HAS_KEY_BINDING:
-				return hasKeyBinding != HAS_KEY_BINDING_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -1040,30 +551,18 @@ public class MenuEntryImpl extends MenuLazyResolverImpl implements MenuEntry {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (entryid: ");
-		result.append(entryid);
-		result.append(", hasImage: ");
-		result.append(hasImage);
-		result.append(", image: ");
-		result.append(image);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", descriptionValue: ");
-		result.append(descriptionValue);
+		result.append(" (hasIcon: ");
+		result.append(hasIcon);
+		result.append(", icon: ");
+		result.append(icon);
+		result.append(", hasTooltip: ");
+		result.append(hasTooltip);
+		result.append(", tooltip: ");
+		result.append(tooltip);
 		result.append(", hasProcess: ");
 		result.append(hasProcess);
 		result.append(", hasPerspective: ");
 		result.append(hasPerspective);
-		result.append(", showBadge: ");
-		result.append(showBadge);
-		result.append(", hasTable: ");
-		result.append(hasTable);
-		result.append(", hasDialog: ");
-		result.append(hasDialog);
-		result.append(", hasUserFilter: ");
-		result.append(hasUserFilter);
-		result.append(", hasKeyBinding: ");
-		result.append(hasKeyBinding);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuLazyResolverImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuLazyResolverImpl.java
deleted file mode 100644
index 050eb99..0000000
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuLazyResolverImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2014,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 
- *  which accompanies this distribution, and is available at 
- *  http{//www.eclipse.org/legal/epl-v10.html 
- * 
- *  Contributors:  
- *  		Loetz GmbH&Co.KG - Initial implementation 
- *  
- */
-package org.eclipse.osbp.xtext.menu.impl;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.osbp.xtext.menu.MenuDslPackage;
-import org.eclipse.osbp.xtext.menu.MenuLazyResolver;
-
-import org.eclipse.osbp.xtext.oxtype.resource.EcoreUtil3;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Menu Lazy Resolver</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class MenuLazyResolverImpl extends MinimalEObjectImpl.Container implements MenuLazyResolver {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MenuLazyResolverImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MenuDslPackage.Literals.MENU_LAZY_RESOLVER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject eResolveProxy(final InternalEObject proxy) {
-		return EcoreUtil3.resolve(proxy, this.eResource().getResourceSet());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
-			case MenuDslPackage.MENU_LAZY_RESOLVER___ERESOLVE_PROXY__INTERNALEOBJECT:
-				return eResolveProxy((InternalEObject)arguments.get(0));
-		}
-		return super.eInvoke(operationID, arguments);
-	}
-
-} //MenuLazyResolverImpl
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuModelImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuModelImpl.java
index 465cfaa..f260b1a 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuModelImpl.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuModelImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -11,22 +13,15 @@
  */
 package org.eclipse.osbp.xtext.menu.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.impl.MinimalEObjectImpl;
 
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.osbp.xtext.menu.MenuDslPackage;
 import org.eclipse.osbp.xtext.menu.MenuModel;
 import org.eclipse.osbp.xtext.menu.MenuPackage;
@@ -42,7 +37,7 @@ import org.eclipse.xtext.xtype.XImportSection;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuModelImpl#getImportSection <em>Import Section</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuModelImpl#getPackages <em>Packages</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuModelImpl#getMenupackage <em>Menupackage</em>}</li>
  * </ul>
  *
  * @generated
@@ -59,14 +54,14 @@ public class MenuModelImpl extends MinimalEObjectImpl.Container implements MenuM
 	protected XImportSection importSection;
 
 	/**
-	 * The cached value of the '{@link #getPackages() <em>Packages</em>}' containment reference list.
+	 * The cached value of the '{@link #getMenupackage() <em>Menupackage</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPackages()
+	 * @see #getMenupackage()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<MenuPackage> packages;
+	protected MenuPackage menupackage;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -135,11 +130,42 @@ public class MenuModelImpl extends MinimalEObjectImpl.Container implements MenuM
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<MenuPackage> getPackages() {
-		if (packages == null) {
-			packages = new EObjectContainmentEList<MenuPackage>(MenuPackage.class, this, MenuDslPackage.MENU_MODEL__PACKAGES);
+	public MenuPackage getMenupackage() {
+		return menupackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetMenupackage(MenuPackage newMenupackage, NotificationChain msgs) {
+		MenuPackage oldMenupackage = menupackage;
+		menupackage = newMenupackage;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_MODEL__MENUPACKAGE, oldMenupackage, newMenupackage);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
-		return packages;
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMenupackage(MenuPackage newMenupackage) {
+		if (newMenupackage != menupackage) {
+			NotificationChain msgs = null;
+			if (menupackage != null)
+				msgs = ((InternalEObject)menupackage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MenuDslPackage.MENU_MODEL__MENUPACKAGE, null, msgs);
+			if (newMenupackage != null)
+				msgs = ((InternalEObject)newMenupackage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MenuDslPackage.MENU_MODEL__MENUPACKAGE, null, msgs);
+			msgs = basicSetMenupackage(newMenupackage, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_MODEL__MENUPACKAGE, newMenupackage, newMenupackage));
 	}
 
 	/**
@@ -152,8 +178,8 @@ public class MenuModelImpl extends MinimalEObjectImpl.Container implements MenuM
 		switch (featureID) {
 			case MenuDslPackage.MENU_MODEL__IMPORT_SECTION:
 				return basicSetImportSection(null, msgs);
-			case MenuDslPackage.MENU_MODEL__PACKAGES:
-				return ((InternalEList<?>)getPackages()).basicRemove(otherEnd, msgs);
+			case MenuDslPackage.MENU_MODEL__MENUPACKAGE:
+				return basicSetMenupackage(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -168,8 +194,8 @@ public class MenuModelImpl extends MinimalEObjectImpl.Container implements MenuM
 		switch (featureID) {
 			case MenuDslPackage.MENU_MODEL__IMPORT_SECTION:
 				return getImportSection();
-			case MenuDslPackage.MENU_MODEL__PACKAGES:
-				return getPackages();
+			case MenuDslPackage.MENU_MODEL__MENUPACKAGE:
+				return getMenupackage();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -179,16 +205,14 @@ public class MenuModelImpl extends MinimalEObjectImpl.Container implements MenuM
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case MenuDslPackage.MENU_MODEL__IMPORT_SECTION:
 				setImportSection((XImportSection)newValue);
 				return;
-			case MenuDslPackage.MENU_MODEL__PACKAGES:
-				getPackages().clear();
-				getPackages().addAll((Collection<? extends MenuPackage>)newValue);
+			case MenuDslPackage.MENU_MODEL__MENUPACKAGE:
+				setMenupackage((MenuPackage)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -205,8 +229,8 @@ public class MenuModelImpl extends MinimalEObjectImpl.Container implements MenuM
 			case MenuDslPackage.MENU_MODEL__IMPORT_SECTION:
 				setImportSection((XImportSection)null);
 				return;
-			case MenuDslPackage.MENU_MODEL__PACKAGES:
-				getPackages().clear();
+			case MenuDslPackage.MENU_MODEL__MENUPACKAGE:
+				setMenupackage((MenuPackage)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -222,8 +246,8 @@ public class MenuModelImpl extends MinimalEObjectImpl.Container implements MenuM
 		switch (featureID) {
 			case MenuDslPackage.MENU_MODEL__IMPORT_SECTION:
 				return importSection != null;
-			case MenuDslPackage.MENU_MODEL__PACKAGES:
-				return packages != null && !packages.isEmpty();
+			case MenuDslPackage.MENU_MODEL__MENUPACKAGE:
+				return menupackage != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuPackageImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuPackageImpl.java
index 74cf3b6..f7a0266 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuPackageImpl.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuPackageImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -28,8 +30,8 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 import org.eclipse.osbp.dsl.semantic.common.types.impl.LPackageImpl;
 
+import org.eclipse.osbp.xtext.menu.MenuCategory;
 import org.eclipse.osbp.xtext.menu.MenuDslPackage;
-import org.eclipse.osbp.xtext.menu.MenuEntry;
 import org.eclipse.osbp.xtext.menu.MenuPackage;
 
 /**
@@ -40,8 +42,7 @@ import org.eclipse.osbp.xtext.menu.MenuPackage;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl#getEntries <em>Entries</em>}</li>
- *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl#isSubMenuIsAccordion <em>Sub Menu Is Accordion</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl#getCategories <em>Categories</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl#getExpandedImage <em>Expanded Image</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl#getCollapsedImage <em>Collapsed Image</em>}</li>
  *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuPackageImpl#getWidth <em>Width</em>}</li>
@@ -53,34 +54,14 @@ import org.eclipse.osbp.xtext.menu.MenuPackage;
  */
 public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 	/**
-	 * The cached value of the '{@link #getEntries() <em>Entries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEntries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MenuEntry> entries;
-
-	/**
-	 * The default value of the '{@link #isSubMenuIsAccordion() <em>Sub Menu Is Accordion</em>}' attribute.
+	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isSubMenuIsAccordion()
+	 * @see #getCategories()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean SUB_MENU_IS_ACCORDION_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isSubMenuIsAccordion() <em>Sub Menu Is Accordion</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSubMenuIsAccordion()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean subMenuIsAccordion = SUB_MENU_IS_ACCORDION_EDEFAULT;
+	protected EList<MenuCategory> categories;
 
 	/**
 	 * The default value of the '{@link #getExpandedImage() <em>Expanded Image</em>}' attribute.
@@ -206,32 +187,11 @@ public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<MenuEntry> getEntries() {
-		if (entries == null) {
-			entries = new EObjectContainmentEList<MenuEntry>(MenuEntry.class, this, MenuDslPackage.MENU_PACKAGE__ENTRIES);
+	public EList<MenuCategory> getCategories() {
+		if (categories == null) {
+			categories = new EObjectContainmentEList<MenuCategory>(MenuCategory.class, this, MenuDslPackage.MENU_PACKAGE__CATEGORIES);
 		}
-		return entries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSubMenuIsAccordion() {
-		return subMenuIsAccordion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSubMenuIsAccordion(boolean newSubMenuIsAccordion) {
-		boolean oldSubMenuIsAccordion = subMenuIsAccordion;
-		subMenuIsAccordion = newSubMenuIsAccordion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_PACKAGE__SUB_MENU_IS_ACCORDION, oldSubMenuIsAccordion, subMenuIsAccordion));
+		return categories;
 	}
 
 	/**
@@ -347,8 +307,8 @@ public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_PACKAGE__ENTRIES:
-				return ((InternalEList<?>)getEntries()).basicRemove(otherEnd, msgs);
+			case MenuDslPackage.MENU_PACKAGE__CATEGORIES:
+				return ((InternalEList<?>)getCategories()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -361,10 +321,8 @@ public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_PACKAGE__ENTRIES:
-				return getEntries();
-			case MenuDslPackage.MENU_PACKAGE__SUB_MENU_IS_ACCORDION:
-				return isSubMenuIsAccordion();
+			case MenuDslPackage.MENU_PACKAGE__CATEGORIES:
+				return getCategories();
 			case MenuDslPackage.MENU_PACKAGE__EXPANDED_IMAGE:
 				return getExpandedImage();
 			case MenuDslPackage.MENU_PACKAGE__COLLAPSED_IMAGE:
@@ -388,12 +346,9 @@ public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_PACKAGE__ENTRIES:
-				getEntries().clear();
-				getEntries().addAll((Collection<? extends MenuEntry>)newValue);
-				return;
-			case MenuDslPackage.MENU_PACKAGE__SUB_MENU_IS_ACCORDION:
-				setSubMenuIsAccordion((Boolean)newValue);
+			case MenuDslPackage.MENU_PACKAGE__CATEGORIES:
+				getCategories().clear();
+				getCategories().addAll((Collection<? extends MenuCategory>)newValue);
 				return;
 			case MenuDslPackage.MENU_PACKAGE__EXPANDED_IMAGE:
 				setExpandedImage((String)newValue);
@@ -422,11 +377,8 @@ public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_PACKAGE__ENTRIES:
-				getEntries().clear();
-				return;
-			case MenuDslPackage.MENU_PACKAGE__SUB_MENU_IS_ACCORDION:
-				setSubMenuIsAccordion(SUB_MENU_IS_ACCORDION_EDEFAULT);
+			case MenuDslPackage.MENU_PACKAGE__CATEGORIES:
+				getCategories().clear();
 				return;
 			case MenuDslPackage.MENU_PACKAGE__EXPANDED_IMAGE:
 				setExpandedImage(EXPANDED_IMAGE_EDEFAULT);
@@ -455,10 +407,8 @@ public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case MenuDslPackage.MENU_PACKAGE__ENTRIES:
-				return entries != null && !entries.isEmpty();
-			case MenuDslPackage.MENU_PACKAGE__SUB_MENU_IS_ACCORDION:
-				return subMenuIsAccordion != SUB_MENU_IS_ACCORDION_EDEFAULT;
+			case MenuDslPackage.MENU_PACKAGE__CATEGORIES:
+				return categories != null && !categories.isEmpty();
 			case MenuDslPackage.MENU_PACKAGE__EXPANDED_IMAGE:
 				return EXPANDED_IMAGE_EDEFAULT == null ? expandedImage != null : !EXPANDED_IMAGE_EDEFAULT.equals(expandedImage);
 			case MenuDslPackage.MENU_PACKAGE__COLLAPSED_IMAGE:
@@ -483,9 +433,7 @@ public class MenuPackageImpl extends LPackageImpl implements MenuPackage {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (subMenuIsAccordion: ");
-		result.append(subMenuIsAccordion);
-		result.append(", expandedImage: ");
+		result.append(" (expandedImage: ");
 		result.append(expandedImage);
 		result.append(", collapsedImage: ");
 		result.append(collapsedImage);
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuTreeImpl.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuTreeImpl.java
new file mode 100644
index 0000000..d54ed3f
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/impl/MenuTreeImpl.java
@@ -0,0 +1,288 @@
+/**
+ * Copyright (c) 2014,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 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:  
+ *  		Loetz GmbH&Co.KG - Initial implementation 
+ *  
+ */
+package org.eclipse.osbp.xtext.menu.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.dsl.semantic.common.types.impl.LPackageImpl;
+
+import org.eclipse.osbp.xtext.menu.MenuDslPackage;
+import org.eclipse.osbp.xtext.menu.MenuEntry;
+import org.eclipse.osbp.xtext.menu.MenuTree;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Menu Tree</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuTreeImpl#isHasTooltip <em>Has Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuTreeImpl#getTooltip <em>Tooltip</em>}</li>
+ *   <li>{@link org.eclipse.osbp.xtext.menu.impl.MenuTreeImpl#getEntries <em>Entries</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MenuTreeImpl extends LPackageImpl implements MenuTree {
+	/**
+	 * The default value of the '{@link #isHasTooltip() <em>Has Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean HAS_TOOLTIP_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isHasTooltip() <em>Has Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isHasTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean hasTooltip = HAS_TOOLTIP_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOOLTIP_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 */
+	protected String tooltip = TOOLTIP_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getEntries() <em>Entries</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEntries()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<MenuEntry> entries;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MenuTreeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return MenuDslPackage.Literals.MENU_TREE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isHasTooltip() {
+		return hasTooltip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHasTooltip(boolean newHasTooltip) {
+		boolean oldHasTooltip = hasTooltip;
+		hasTooltip = newHasTooltip;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_TREE__HAS_TOOLTIP, oldHasTooltip, hasTooltip));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTooltip() {
+		return tooltip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTooltip(String newTooltip) {
+		String oldTooltip = tooltip;
+		tooltip = newTooltip;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MenuDslPackage.MENU_TREE__TOOLTIP, oldTooltip, tooltip));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<MenuEntry> getEntries() {
+		if (entries == null) {
+			entries = new EObjectContainmentEList<MenuEntry>(MenuEntry.class, this, MenuDslPackage.MENU_TREE__ENTRIES);
+		}
+		return entries;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case MenuDslPackage.MENU_TREE__ENTRIES:
+				return ((InternalEList<?>)getEntries()).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 MenuDslPackage.MENU_TREE__HAS_TOOLTIP:
+				return isHasTooltip();
+			case MenuDslPackage.MENU_TREE__TOOLTIP:
+				return getTooltip();
+			case MenuDslPackage.MENU_TREE__ENTRIES:
+				return getEntries();
+		}
+		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 MenuDslPackage.MENU_TREE__HAS_TOOLTIP:
+				setHasTooltip((Boolean)newValue);
+				return;
+			case MenuDslPackage.MENU_TREE__TOOLTIP:
+				setTooltip((String)newValue);
+				return;
+			case MenuDslPackage.MENU_TREE__ENTRIES:
+				getEntries().clear();
+				getEntries().addAll((Collection<? extends MenuEntry>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MenuDslPackage.MENU_TREE__HAS_TOOLTIP:
+				setHasTooltip(HAS_TOOLTIP_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_TREE__TOOLTIP:
+				setTooltip(TOOLTIP_EDEFAULT);
+				return;
+			case MenuDslPackage.MENU_TREE__ENTRIES:
+				getEntries().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MenuDslPackage.MENU_TREE__HAS_TOOLTIP:
+				return hasTooltip != HAS_TOOLTIP_EDEFAULT;
+			case MenuDslPackage.MENU_TREE__TOOLTIP:
+				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
+			case MenuDslPackage.MENU_TREE__ENTRIES:
+				return entries != null && !entries.isEmpty();
+		}
+		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(" (hasTooltip: ");
+		result.append(hasTooltip);
+		result.append(", tooltip: ");
+		result.append(tooltip);
+		result.append(')');
+		return result.toString();
+	}
+
+} //MenuTreeImpl
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslAdapterFactory.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslAdapterFactory.java
index 1d351d8..f1edbe2 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslAdapterFactory.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslAdapterFactory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -84,14 +86,18 @@ public class MenuDslAdapterFactory extends AdapterFactoryImpl {
 				return createMenuModelAdapter();
 			}
 			@Override
-			public Adapter caseMenuLazyResolver(MenuLazyResolver object) {
-				return createMenuLazyResolverAdapter();
-			}
-			@Override
 			public Adapter caseMenuPackage(MenuPackage object) {
 				return createMenuPackageAdapter();
 			}
 			@Override
+			public Adapter caseMenuCategory(MenuCategory object) {
+				return createMenuCategoryAdapter();
+			}
+			@Override
+			public Adapter caseMenuTree(MenuTree object) {
+				return createMenuTreeAdapter();
+			}
+			@Override
 			public Adapter caseMenuEntry(MenuEntry object) {
 				return createMenuEntryAdapter();
 			}
@@ -138,30 +144,44 @@ public class MenuDslAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.menu.MenuLazyResolver <em>Menu Lazy Resolver</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.menu.MenuPackage <em>Menu Package</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.menu.MenuLazyResolver
+	 * @see org.eclipse.osbp.xtext.menu.MenuPackage
 	 * @generated
 	 */
-	public Adapter createMenuLazyResolverAdapter() {
+	public Adapter createMenuPackageAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.menu.MenuPackage <em>Menu Package</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.menu.MenuCategory <em>Menu Category</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.menu.MenuPackage
+	 * @see org.eclipse.osbp.xtext.menu.MenuCategory
 	 * @generated
 	 */
-	public Adapter createMenuPackageAdapter() {
+	public Adapter createMenuCategoryAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.xtext.menu.MenuTree <em>Menu Tree</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.menu.MenuTree
+	 * @generated
+	 */
+	public Adapter createMenuTreeAdapter() {
 		return null;
 	}
 
diff --git a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslSwitch.java b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslSwitch.java
index d1bc6a2..1f4fef3 100644
--- a/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslSwitch.java
+++ b/org.eclipse.osbp.xtext.menu/emf-gen/org/eclipse/osbp/xtext/menu/util/MenuDslSwitch.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2014,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:  
  *  		Loetz GmbH&Co.KG - Initial implementation 
@@ -84,12 +86,6 @@ public class MenuDslSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case MenuDslPackage.MENU_LAZY_RESOLVER: {
-				MenuLazyResolver menuLazyResolver = (MenuLazyResolver)theEObject;
-				T result = caseMenuLazyResolver(menuLazyResolver);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case MenuDslPackage.MENU_PACKAGE: {
 				MenuPackage menuPackage = (MenuPackage)theEObject;
 				T result = caseMenuPackage(menuPackage);
@@ -98,10 +94,27 @@ public class MenuDslSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case MenuDslPackage.MENU_CATEGORY: {
+				MenuCategory menuCategory = (MenuCategory)theEObject;
+				T result = caseMenuCategory(menuCategory);
+				if (result == null) result = caseLPackage(menuCategory);
+				if (result == null) result = caseLLazyResolver(menuCategory);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case MenuDslPackage.MENU_TREE: {
+				MenuTree menuTree = (MenuTree)theEObject;
+				T result = caseMenuTree(menuTree);
+				if (result == null) result = caseLPackage(menuTree);
+				if (result == null) result = caseLLazyResolver(menuTree);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case MenuDslPackage.MENU_ENTRY: {
 				MenuEntry menuEntry = (MenuEntry)theEObject;
 				T result = caseMenuEntry(menuEntry);
-				if (result == null) result = caseMenuLazyResolver(menuEntry);
+				if (result == null) result = caseLPackage(menuEntry);
+				if (result == null) result = caseLLazyResolver(menuEntry);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -125,32 +138,47 @@ public class MenuDslSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Menu Lazy Resolver</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Menu Package</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>Menu Lazy Resolver</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Menu Package</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseMenuLazyResolver(MenuLazyResolver object) {
+	public T caseMenuPackage(MenuPackage object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Menu Package</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Menu Category</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>Menu Package</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Menu Category</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseMenuPackage(MenuPackage object) {
+	public T caseMenuCategory(MenuCategory object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Menu Tree</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>Menu Tree</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMenuTree(MenuTree object) {
 		return null;
 	}
 
diff --git a/org.eclipse.osbp.xtext.menu/epl-2.0.html b/org.eclipse.osbp.xtext.menu/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.xtext.menu/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.menu/epl-v10.html b/org.eclipse.osbp.xtext.menu/epl-v10.html
deleted file mode 100644
index b398acc..0000000
--- a/org.eclipse.osbp.xtext.menu/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.menu/license.html b/org.eclipse.osbp.xtext.menu/license.html
index 6e579a5..008b801 100644
--- a/org.eclipse.osbp.xtext.menu/license.html
+++ b/org.eclipse.osbp.xtext.menu/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.menu/model/MenuDsl.xcore b/org.eclipse.osbp.xtext.menu/model/MenuDsl.xcore
index 131d5b1..d403fae 100644
--- a/org.eclipse.osbp.xtext.menu/model/MenuDsl.xcore
+++ b/org.eclipse.osbp.xtext.menu/model/MenuDsl.xcore
@@ -7,9 +7,11 @@
 @GenModel(literalsInterface="true")
 @GenModel(copyrightText="Copyright (c) 2014,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:  
  		Loetz GmbH&Co.KG - Initial implementation 
@@ -18,33 +20,24 @@
 @Ecore(nsPrefix="menudsl")
 @Ecore(rootPackage="menudsl")
 package org.eclipse.osbp.xtext.menu
- 
-import org.eclipse.emf.ecore.EObject
+
 import org.eclipse.emf.ecore.InternalEObject
 import org.eclipse.osbp.dsl.semantic.common.types.LPackage
-import org.eclipse.osbp.xtext.oxtype.resource.EcoreUtil3
 import org.eclipse.osbp.xtext.blip.Blip
+import org.eclipse.osbp.xtext.dialogdsl.Dialog
 import org.eclipse.osbp.xtext.perspective.Perspective
 import org.eclipse.osbp.xtext.table.Table
-import org.eclipse.osbp.xtext.dialogdsl.Dialog
 import org.eclipse.xtext.xtype.XImportSection
  
 class MenuModel{
-	contains XImportSection importSection
-	contains MenuPackage[] packages
+	contains XImportSection importSection 
+	contains MenuPackage menupackage
 }
 
 type InternalEObject wraps InternalEObject
 
-class MenuLazyResolver {
-	op EObject eResolveProxy(InternalEObject proxy) {
-		return EcoreUtil3.resolve(proxy, this.eResource().resourceSet);
-	}
-}
-
 class MenuPackage extends LPackage{
-	contains MenuEntry[] entries
-	boolean subMenuIsAccordion
+	contains MenuCategory[] categories
 	String expandedImage
 	String collapsedImage
 	String width
@@ -52,22 +45,33 @@ class MenuPackage extends LPackage{
 	boolean hasDesigner
 }
 
-class MenuEntry extends MenuLazyResolver {
-	String entryid
-	boolean hasImage
-	String image
-	boolean description
-	String descriptionValue
-	contains MenuEntry[] subentries
-	boolean hasProcess
-	refers Blip process
-	boolean hasPerspective 
-	refers Perspective perspective
-	boolean showBadge
+class MenuCategory extends LPackage {
+	contains MenuTree[] trees
 	boolean hasTable
 	refers Table table
 	boolean hasDialog
 	refers Dialog dialog
 	boolean hasUserFilter
+	boolean hasReportPrinter
 	boolean hasKeyBinding
+	boolean hasSystemSettings
+	boolean hasTooltip
+	String tooltip
+}
+
+class MenuTree extends LPackage {
+	boolean hasTooltip
+	String tooltip
+	contains MenuEntry[] entries
+}
+
+class MenuEntry extends LPackage {
+	boolean hasIcon
+	String icon
+	boolean hasTooltip
+	String tooltip
+	boolean hasProcess
+	refers Blip process
+	boolean hasPerspective 
+	refers Perspective perspective
 }
diff --git a/org.eclipse.osbp.xtext.menu/plugin.properties b/org.eclipse.osbp.xtext.menu/plugin.properties
index 5f1c693..3c5df36 100644
--- a/org.eclipse.osbp.xtext.menu/plugin.properties
+++ b/org.eclipse.osbp.xtext.menu/plugin.properties
@@ -1,12 +1,14 @@
 # Copyright (c) 2014, 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 
 # 
 #  Based on ideas from Xtext, Xtend, Xcore
 #   
-#  Contributors{  
+#  Contributors:  
 #  		Joerg Riegel - Initial implementation 
 #  
 
diff --git a/org.eclipse.osbp.xtext.menu/plugin.xml b/org.eclipse.osbp.xtext.menu/plugin.xml
index abfa4a2..d74a662 100644
--- a/org.eclipse.osbp.xtext.menu/plugin.xml
+++ b/org.eclipse.osbp.xtext.menu/plugin.xml
@@ -4,9 +4,11 @@
 <!--
  Copyright (c) 2014, 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 
  
   Based on ideas from Xtext, Xtend, Xcore
    
diff --git a/org.eclipse.osbp.xtext.menu/pom.xml b/org.eclipse.osbp.xtext.menu/pom.xml
index 1241c19..2dc8c33 100644
--- a/org.eclipse.osbp.xtext.menu/pom.xml
+++ b/org.eclipse.osbp.xtext.menu/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.menu/src-gen/org/eclipse/osbp/xtext/menu/MenuDsl.xtextbin b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/MenuDsl.xtextbin
index 89fb40d..d6a864d 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/MenuDsl.xtextbin
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/MenuDsl.xtextbin
diff --git a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.g b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.g
index 29c28e8..aa8de68 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.g
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.g
@@ -98,22 +98,22 @@ ruleMenuModel returns [EObject current=null]
 		(
 			(
 				{
-					newCompositeNode(grammarAccess.getMenuModelAccess().getPackagesMenuPackageParserRuleCall_1_0());
+					newCompositeNode(grammarAccess.getMenuModelAccess().getMenupackageMenuPackageParserRuleCall_1_0());
 				}
-				lv_packages_1_0=ruleMenuPackage
+				lv_menupackage_1_0=ruleMenuPackage
 				{
 					if ($current==null) {
 						$current = createModelElementForParent(grammarAccess.getMenuModelRule());
 					}
-					add(
+					set(
 						$current,
-						"packages",
-						lv_packages_1_0,
+						"menupackage",
+						lv_menupackage_1_0,
 						"org.eclipse.osbp.xtext.menu.MenuDsl.MenuPackage");
 					afterParserOrEnumRuleCall();
 				}
 			)
-		)*
+		)
 	)
 ;
 
@@ -164,19 +164,15 @@ ruleMenuPackage returns [EObject current=null]
 			)
 		)
 		(
-			otherlv_3='{'
-			{
-				newLeafNode(otherlv_3, grammarAccess.getMenuPackageAccess().getLeftCurlyBracketKeyword_3_0());
-			}
-			otherlv_4='expandedImage'
+			otherlv_3='expandedImage'
 			{
-				newLeafNode(otherlv_4, grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_1());
+				newLeafNode(otherlv_3, grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_0());
 			}
 			(
 				(
-					lv_expandedImage_5_0=RULE_STRING
+					lv_expandedImage_4_0=RULE_STRING
 					{
-						newLeafNode(lv_expandedImage_5_0, grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_2_0());
+						newLeafNode(lv_expandedImage_4_0, grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_1_0());
 					}
 					{
 						if ($current==null) {
@@ -185,20 +181,20 @@ ruleMenuPackage returns [EObject current=null]
 						setWithLastConsumed(
 							$current,
 							"expandedImage",
-							lv_expandedImage_5_0,
+							lv_expandedImage_4_0,
 							"org.eclipse.xtext.xbase.Xtype.STRING");
 					}
 				)
 			)
-			otherlv_6='collapsedImage'
+			otherlv_5='collapsedImage'
 			{
-				newLeafNode(otherlv_6, grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_3());
+				newLeafNode(otherlv_5, grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_2());
 			}
 			(
 				(
-					lv_collapsedImage_7_0=RULE_STRING
+					lv_collapsedImage_6_0=RULE_STRING
 					{
-						newLeafNode(lv_collapsedImage_7_0, grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_4_0());
+						newLeafNode(lv_collapsedImage_6_0, grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_3_0());
 					}
 					{
 						if ($current==null) {
@@ -207,35 +203,21 @@ ruleMenuPackage returns [EObject current=null]
 						setWithLastConsumed(
 							$current,
 							"collapsedImage",
-							lv_collapsedImage_7_0,
+							lv_collapsedImage_6_0,
 							"org.eclipse.xtext.xbase.Xtype.STRING");
 					}
 				)
 			)
 			(
-				(
-					lv_subMenuIsAccordion_8_0='accordionSubmenu'
-					{
-						newLeafNode(lv_subMenuIsAccordion_8_0, grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0());
-					}
-					{
-						if ($current==null) {
-							$current = createModelElement(grammarAccess.getMenuPackageRule());
-						}
-						setWithLastConsumed($current, "subMenuIsAccordion", true, "accordionSubmenu");
-					}
-				)
-			)?
-			(
-				otherlv_9='height'
+				otherlv_7='height'
 				{
-					newLeafNode(otherlv_9, grammarAccess.getMenuPackageAccess().getHeightKeyword_3_6_0());
+					newLeafNode(otherlv_7, grammarAccess.getMenuPackageAccess().getHeightKeyword_3_4_0());
 				}
 				(
 					(
-						lv_height_10_0=RULE_STRING
+						lv_height_8_0=RULE_STRING
 						{
-							newLeafNode(lv_height_10_0, grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_6_1_0());
+							newLeafNode(lv_height_8_0, grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_4_1_0());
 						}
 						{
 							if ($current==null) {
@@ -244,22 +226,22 @@ ruleMenuPackage returns [EObject current=null]
 							setWithLastConsumed(
 								$current,
 								"height",
-								lv_height_10_0,
+								lv_height_8_0,
 								"org.eclipse.xtext.xbase.Xtype.STRING");
 						}
 					)
 				)
 			)?
 			(
-				otherlv_11='width'
+				otherlv_9='width'
 				{
-					newLeafNode(otherlv_11, grammarAccess.getMenuPackageAccess().getWidthKeyword_3_7_0());
+					newLeafNode(otherlv_9, grammarAccess.getMenuPackageAccess().getWidthKeyword_3_5_0());
 				}
 				(
 					(
-						lv_width_12_0=RULE_STRING
+						lv_width_10_0=RULE_STRING
 						{
-							newLeafNode(lv_width_12_0, grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_7_1_0());
+							newLeafNode(lv_width_10_0, grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_5_1_0());
 						}
 						{
 							if ($current==null) {
@@ -268,7 +250,7 @@ ruleMenuPackage returns [EObject current=null]
 							setWithLastConsumed(
 								$current,
 								"width",
-								lv_width_12_0,
+								lv_width_10_0,
 								"org.eclipse.xtext.xbase.Xtype.STRING");
 						}
 					)
@@ -276,9 +258,9 @@ ruleMenuPackage returns [EObject current=null]
 			)?
 			(
 				(
-					lv_hasDesigner_13_0='designer'
+					lv_hasDesigner_11_0='designer'
 					{
-						newLeafNode(lv_hasDesigner_13_0, grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0());
+						newLeafNode(lv_hasDesigner_11_0, grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0());
 					}
 					{
 						if ($current==null) {
@@ -291,39 +273,35 @@ ruleMenuPackage returns [EObject current=null]
 			(
 				(
 					{
-						newCompositeNode(grammarAccess.getMenuPackageAccess().getEntriesMenuEntryParserRuleCall_3_9_0());
+						newCompositeNode(grammarAccess.getMenuPackageAccess().getCategoriesMenuCategoryParserRuleCall_3_7_0());
 					}
-					lv_entries_14_0=ruleMenuEntry
+					lv_categories_12_0=ruleMenuCategory
 					{
 						if ($current==null) {
 							$current = createModelElementForParent(grammarAccess.getMenuPackageRule());
 						}
 						add(
 							$current,
-							"entries",
-							lv_entries_14_0,
-							"org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
+							"categories",
+							lv_categories_12_0,
+							"org.eclipse.osbp.xtext.menu.MenuDsl.MenuCategory");
 						afterParserOrEnumRuleCall();
 					}
 				)
 			)*
-			otherlv_15='}'
-			{
-				newLeafNode(otherlv_15, grammarAccess.getMenuPackageAccess().getRightCurlyBracketKeyword_3_10());
-			}
 		)?
 	)
 ;
 
-// Entry rule entryRuleMenuEntry
-entryRuleMenuEntry returns [EObject current=null]:
-	{ newCompositeNode(grammarAccess.getMenuEntryRule()); }
-	iv_ruleMenuEntry=ruleMenuEntry
-	{ $current=$iv_ruleMenuEntry.current; }
+// Entry rule entryRuleMenuCategory
+entryRuleMenuCategory returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getMenuCategoryRule()); }
+	iv_ruleMenuCategory=ruleMenuCategory
+	{ $current=$iv_ruleMenuCategory.current; }
 	EOF;
 
-// Rule MenuEntry
-ruleMenuEntry returns [EObject current=null]
+// Rule MenuCategory
+ruleMenuCategory returns [EObject current=null]
 @init {
 	enterRule();
 }
@@ -331,31 +309,24 @@ ruleMenuEntry returns [EObject current=null]
 	leaveRule();
 }:
 	(
-		(
-			{
-				$current = forceCreateModelElement(
-					grammarAccess.getMenuEntryAccess().getMenuEntryAction_0(),
-					$current);
-			}
-		)
-		otherlv_1='entry'
+		otherlv_0='category'
 		{
-			newLeafNode(otherlv_1, grammarAccess.getMenuEntryAccess().getEntryKeyword_1());
+			newLeafNode(otherlv_0, grammarAccess.getMenuCategoryAccess().getCategoryKeyword_0());
 		}
 		(
 			(
 				{
-					newCompositeNode(grammarAccess.getMenuEntryAccess().getEntryidTRANSLATABLEIDParserRuleCall_2_0());
+					newCompositeNode(grammarAccess.getMenuCategoryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0());
 				}
-				lv_entryid_2_0=ruleTRANSLATABLEID
+				lv_name_1_0=ruleTRANSLATABLEID
 				{
 					if ($current==null) {
-						$current = createModelElementForParent(grammarAccess.getMenuEntryRule());
+						$current = createModelElementForParent(grammarAccess.getMenuCategoryRule());
 					}
 					set(
 						$current,
-						"entryid",
-						lv_entryid_2_0,
+						"name",
+						lv_name_1_0,
 						"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLEID");
 					afterParserOrEnumRuleCall();
 				}
@@ -364,159 +335,347 @@ ruleMenuEntry returns [EObject current=null]
 		(
 			(
 				(
-					lv_description_3_0='describedBy'
+					(
+						lv_hasTable_2_0='table'
+						{
+							newLeafNode(lv_hasTable_2_0, grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0());
+						}
+						{
+							if ($current==null) {
+								$current = createModelElement(grammarAccess.getMenuCategoryRule());
+							}
+							setWithLastConsumed($current, "hasTable", true, "table");
+						}
+					)
+				)
+				(
+					(
+						{
+							if ($current==null) {
+								$current = createModelElement(grammarAccess.getMenuCategoryRule());
+							}
+						}
+						otherlv_3=RULE_ID
+						{
+							newLeafNode(otherlv_3, grammarAccess.getMenuCategoryAccess().getTableTableCrossReference_2_0_1_0());
+						}
+					)
+				)
+			)
+			    |
+			(
+				(
+					(
+						lv_hasDialog_4_0='dialog'
+						{
+							newLeafNode(lv_hasDialog_4_0, grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0());
+						}
+						{
+							if ($current==null) {
+								$current = createModelElement(grammarAccess.getMenuCategoryRule());
+							}
+							setWithLastConsumed($current, "hasDialog", true, "dialog");
+						}
+					)
+				)
+				(
+					(
+						{
+							if ($current==null) {
+								$current = createModelElement(grammarAccess.getMenuCategoryRule());
+							}
+						}
+						otherlv_5=RULE_ID
+						{
+							newLeafNode(otherlv_5, grammarAccess.getMenuCategoryAccess().getDialogDialogCrossReference_2_1_1_0());
+						}
+					)
+				)
+			)
+			    |
+			(
+				(
+					lv_hasUserFilter_6_0='userFilter'
 					{
-						newLeafNode(lv_description_3_0, grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0());
+						newLeafNode(lv_hasUserFilter_6_0, grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0());
 					}
 					{
 						if ($current==null) {
-							$current = createModelElement(grammarAccess.getMenuEntryRule());
+							$current = createModelElement(grammarAccess.getMenuCategoryRule());
 						}
-						setWithLastConsumed($current, "description", true, "describedBy");
+						setWithLastConsumed($current, "hasUserFilter", true, "userFilter");
 					}
 				)
 			)
+			    |
 			(
 				(
+					lv_hasReportPrinter_7_0='reportPrinter'
 					{
-						newCompositeNode(grammarAccess.getMenuEntryAccess().getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0());
+						newLeafNode(lv_hasReportPrinter_7_0, grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0());
 					}
-					lv_descriptionValue_4_0=ruleTRANSLATABLESTRING
 					{
 						if ($current==null) {
-							$current = createModelElementForParent(grammarAccess.getMenuEntryRule());
+							$current = createModelElement(grammarAccess.getMenuCategoryRule());
 						}
-						set(
-							$current,
-							"descriptionValue",
-							lv_descriptionValue_4_0,
-							"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLESTRING");
-						afterParserOrEnumRuleCall();
+						setWithLastConsumed($current, "hasReportPrinter", true, "reportPrinter");
 					}
 				)
 			)
-		)?
-		(
+			    |
 			(
 				(
-					lv_hasImage_5_0='image'
+					lv_hasKeyBinding_8_0='keyBinding'
 					{
-						newLeafNode(lv_hasImage_5_0, grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0());
+						newLeafNode(lv_hasKeyBinding_8_0, grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0());
 					}
 					{
 						if ($current==null) {
-							$current = createModelElement(grammarAccess.getMenuEntryRule());
+							$current = createModelElement(grammarAccess.getMenuCategoryRule());
 						}
-						setWithLastConsumed($current, "hasImage", true, "image");
+						setWithLastConsumed($current, "hasKeyBinding", true, "keyBinding");
 					}
 				)
 			)
+			    |
 			(
 				(
-					lv_image_6_0=RULE_STRING
+					lv_hasSystemSettings_9_0='systemSettings'
 					{
-						newLeafNode(lv_image_6_0, grammarAccess.getMenuEntryAccess().getImageSTRINGTerminalRuleCall_4_1_0());
+						newLeafNode(lv_hasSystemSettings_9_0, grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0());
 					}
 					{
 						if ($current==null) {
-							$current = createModelElement(grammarAccess.getMenuEntryRule());
+							$current = createModelElement(grammarAccess.getMenuCategoryRule());
 						}
-						setWithLastConsumed(
-							$current,
-							"image",
-							lv_image_6_0,
-							"org.eclipse.xtext.xbase.Xtype.STRING");
+						setWithLastConsumed($current, "hasSystemSettings", true, "systemSettings");
 					}
 				)
 			)
+			    |
+			(
+				otherlv_10='{'
+				{
+					newLeafNode(otherlv_10, grammarAccess.getMenuCategoryAccess().getLeftCurlyBracketKeyword_2_6_0());
+				}
+				(
+					(
+						{
+							newCompositeNode(grammarAccess.getMenuCategoryAccess().getTreesMenuTreeParserRuleCall_2_6_1_0());
+						}
+						lv_trees_11_0=ruleMenuTree
+						{
+							if ($current==null) {
+								$current = createModelElementForParent(grammarAccess.getMenuCategoryRule());
+							}
+							add(
+								$current,
+								"trees",
+								lv_trees_11_0,
+								"org.eclipse.osbp.xtext.menu.MenuDsl.MenuTree");
+							afterParserOrEnumRuleCall();
+						}
+					)
+				)*
+				otherlv_12='}'
+				{
+					newLeafNode(otherlv_12, grammarAccess.getMenuCategoryAccess().getRightCurlyBracketKeyword_2_6_2());
+				}
+			)
 		)?
+	)
+;
+
+// Entry rule entryRuleMenuTree
+entryRuleMenuTree returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getMenuTreeRule()); }
+	iv_ruleMenuTree=ruleMenuTree
+	{ $current=$iv_ruleMenuTree.current; }
+	EOF;
+
+// Rule MenuTree
+ruleMenuTree returns [EObject current=null]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	(
+		otherlv_0='tree'
+		{
+			newLeafNode(otherlv_0, grammarAccess.getMenuTreeAccess().getTreeKeyword_0());
+		}
 		(
 			(
-				lv_showBadge_7_0='showBadge'
 				{
-					newLeafNode(lv_showBadge_7_0, grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0());
+					newCompositeNode(grammarAccess.getMenuTreeAccess().getNameTRANSLATABLEIDParserRuleCall_1_0());
 				}
+				lv_name_1_0=ruleTRANSLATABLEID
 				{
 					if ($current==null) {
-						$current = createModelElement(grammarAccess.getMenuEntryRule());
+						$current = createModelElementForParent(grammarAccess.getMenuTreeRule());
 					}
-					setWithLastConsumed($current, "showBadge", true, "showBadge");
+					set(
+						$current,
+						"name",
+						lv_name_1_0,
+						"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLEID");
+					afterParserOrEnumRuleCall();
 				}
 			)
-		)?
+		)
 		(
 			(
 				(
-					(
-						lv_hasProcess_8_0='process'
-						{
-							newLeafNode(lv_hasProcess_8_0, grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0());
-						}
-						{
-							if ($current==null) {
-								$current = createModelElement(grammarAccess.getMenuEntryRule());
-							}
-							setWithLastConsumed($current, "hasProcess", true, "process");
+					lv_hasTooltip_2_0='tooltip'
+					{
+						newLeafNode(lv_hasTooltip_2_0, grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0());
+					}
+					{
+						if ($current==null) {
+							$current = createModelElement(grammarAccess.getMenuTreeRule());
 						}
-					)
+						setWithLastConsumed($current, "hasTooltip", true, "tooltip");
+					}
 				)
+			)
+			(
 				(
-					(
-						{
-							if ($current==null) {
-								$current = createModelElement(grammarAccess.getMenuEntryRule());
-							}
-						}
-						otherlv_9=RULE_ID
-						{
-							newLeafNode(otherlv_9, grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_6_0_1_0());
+					{
+						newCompositeNode(grammarAccess.getMenuTreeAccess().getTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0());
+					}
+					lv_tooltip_3_0=ruleTRANSLATABLESTRING
+					{
+						if ($current==null) {
+							$current = createModelElementForParent(grammarAccess.getMenuTreeRule());
 						}
-					)
+						set(
+							$current,
+							"tooltip",
+							lv_tooltip_3_0,
+							"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLESTRING");
+						afterParserOrEnumRuleCall();
+					}
 				)
 			)
-			    |
+		)?
+		otherlv_4='{'
+		{
+			newLeafNode(otherlv_4, grammarAccess.getMenuTreeAccess().getLeftCurlyBracketKeyword_3());
+		}
+		(
+			(
+				{
+					newCompositeNode(grammarAccess.getMenuTreeAccess().getEntriesMenuEntryParserRuleCall_4_0());
+				}
+				lv_entries_5_0=ruleMenuEntry
+				{
+					if ($current==null) {
+						$current = createModelElementForParent(grammarAccess.getMenuTreeRule());
+					}
+					add(
+						$current,
+						"entries",
+						lv_entries_5_0,
+						"org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
+					afterParserOrEnumRuleCall();
+				}
+			)
+		)*
+		otherlv_6='}'
+		{
+			newLeafNode(otherlv_6, grammarAccess.getMenuTreeAccess().getRightCurlyBracketKeyword_5());
+		}
+	)
+;
+
+// Entry rule entryRuleMenuEntry
+entryRuleMenuEntry returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getMenuEntryRule()); }
+	iv_ruleMenuEntry=ruleMenuEntry
+	{ $current=$iv_ruleMenuEntry.current; }
+	EOF;
+
+// Rule MenuEntry
+ruleMenuEntry returns [EObject current=null]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	(
+		otherlv_0='entry'
+		{
+			newLeafNode(otherlv_0, grammarAccess.getMenuEntryAccess().getEntryKeyword_0());
+		}
+		(
+			(
+				{
+					newCompositeNode(grammarAccess.getMenuEntryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0());
+				}
+				lv_name_1_0=ruleTRANSLATABLEID
+				{
+					if ($current==null) {
+						$current = createModelElementForParent(grammarAccess.getMenuEntryRule());
+					}
+					set(
+						$current,
+						"name",
+						lv_name_1_0,
+						"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLEID");
+					afterParserOrEnumRuleCall();
+				}
+			)
+		)
+		(
 			(
 				(
-					(
-						lv_hasPerspective_10_0='perspective'
-						{
-							newLeafNode(lv_hasPerspective_10_0, grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0());
-						}
-						{
-							if ($current==null) {
-								$current = createModelElement(grammarAccess.getMenuEntryRule());
-							}
-							setWithLastConsumed($current, "hasPerspective", true, "perspective");
+					lv_hasIcon_2_0='icon'
+					{
+						newLeafNode(lv_hasIcon_2_0, grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0());
+					}
+					{
+						if ($current==null) {
+							$current = createModelElement(grammarAccess.getMenuEntryRule());
 						}
-					)
+						setWithLastConsumed($current, "hasIcon", true, "icon");
+					}
 				)
+			)
+			(
 				(
-					(
-						{
-							if ($current==null) {
-								$current = createModelElement(grammarAccess.getMenuEntryRule());
-							}
-						}
-						otherlv_11=RULE_ID
-						{
-							newLeafNode(otherlv_11, grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_6_1_1_0());
+					lv_icon_3_0=RULE_STRING
+					{
+						newLeafNode(lv_icon_3_0, grammarAccess.getMenuEntryAccess().getIconSTRINGTerminalRuleCall_2_1_0());
+					}
+					{
+						if ($current==null) {
+							$current = createModelElement(grammarAccess.getMenuEntryRule());
 						}
-					)
+						setWithLastConsumed(
+							$current,
+							"icon",
+							lv_icon_3_0,
+							"org.eclipse.xtext.xbase.Xtype.STRING");
+					}
 				)
 			)
-			    |
+		)?
+		(
 			(
 				(
 					(
-						lv_hasTable_12_0='table'
+						lv_hasProcess_4_0='process'
 						{
-							newLeafNode(lv_hasTable_12_0, grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0());
+							newLeafNode(lv_hasProcess_4_0, grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0());
 						}
 						{
 							if ($current==null) {
 								$current = createModelElement(grammarAccess.getMenuEntryRule());
 							}
-							setWithLastConsumed($current, "hasTable", true, "table");
+							setWithLastConsumed($current, "hasProcess", true, "process");
 						}
 					)
 				)
@@ -527,9 +686,9 @@ ruleMenuEntry returns [EObject current=null]
 								$current = createModelElement(grammarAccess.getMenuEntryRule());
 							}
 						}
-						otherlv_13=RULE_ID
+						otherlv_5=RULE_ID
 						{
-							newLeafNode(otherlv_13, grammarAccess.getMenuEntryAccess().getTableTableCrossReference_6_2_1_0());
+							newLeafNode(otherlv_5, grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_3_0_1_0());
 						}
 					)
 				)
@@ -538,15 +697,15 @@ ruleMenuEntry returns [EObject current=null]
 			(
 				(
 					(
-						lv_hasDialog_14_0='dialog'
+						lv_hasPerspective_6_0='perspective'
 						{
-							newLeafNode(lv_hasDialog_14_0, grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0());
+							newLeafNode(lv_hasPerspective_6_0, grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0());
 						}
 						{
 							if ($current==null) {
 								$current = createModelElement(grammarAccess.getMenuEntryRule());
 							}
-							setWithLastConsumed($current, "hasDialog", true, "dialog");
+							setWithLastConsumed($current, "hasPerspective", true, "perspective");
 						}
 					)
 				)
@@ -557,73 +716,14 @@ ruleMenuEntry returns [EObject current=null]
 								$current = createModelElement(grammarAccess.getMenuEntryRule());
 							}
 						}
-						otherlv_15=RULE_ID
+						otherlv_7=RULE_ID
 						{
-							newLeafNode(otherlv_15, grammarAccess.getMenuEntryAccess().getDialogDialogCrossReference_6_3_1_0());
+							newLeafNode(otherlv_7, grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_3_1_1_0());
 						}
 					)
 				)
 			)
-			    |
-			(
-				(
-					lv_hasUserFilter_16_0='userFilter'
-					{
-						newLeafNode(lv_hasUserFilter_16_0, grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0());
-					}
-					{
-						if ($current==null) {
-							$current = createModelElement(grammarAccess.getMenuEntryRule());
-						}
-						setWithLastConsumed($current, "hasUserFilter", true, "userFilter");
-					}
-				)
-			)
-			    |
-			(
-				(
-					lv_hasKeyBinding_17_0='keyBinding'
-					{
-						newLeafNode(lv_hasKeyBinding_17_0, grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0());
-					}
-					{
-						if ($current==null) {
-							$current = createModelElement(grammarAccess.getMenuEntryRule());
-						}
-						setWithLastConsumed($current, "hasKeyBinding", true, "keyBinding");
-					}
-				)
-			)
-		)?
-		(
-			otherlv_18='{'
-			{
-				newLeafNode(otherlv_18, grammarAccess.getMenuEntryAccess().getLeftCurlyBracketKeyword_7_0());
-			}
-			(
-				(
-					{
-						newCompositeNode(grammarAccess.getMenuEntryAccess().getSubentriesMenuEntryParserRuleCall_7_1_0());
-					}
-					lv_subentries_19_0=ruleMenuEntry
-					{
-						if ($current==null) {
-							$current = createModelElementForParent(grammarAccess.getMenuEntryRule());
-						}
-						add(
-							$current,
-							"subentries",
-							lv_subentries_19_0,
-							"org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
-						afterParserOrEnumRuleCall();
-					}
-				)
-			)*
-			otherlv_20='}'
-			{
-				newLeafNode(otherlv_20, grammarAccess.getMenuEntryAccess().getRightCurlyBracketKeyword_7_2());
-			}
-		)?
+		)
 	)
 ;
 
diff --git a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.tokens b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.tokens
index b503fc3..662cd8b 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.tokens
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDsl.tokens
@@ -1,96 +1,98 @@
-'!'=72
-'!='=57
-'!=='=59
-'#'=43
-'%'=71
-'%='=50
-'&&'=55
-'&'=105
-'('=39
-')'=41
-'*'=35
-'**'=69
-'*='=48
-'+'=67
-'++'=74
-'+='=46
-','=40
-'-'=68
-'--'=75
-'-='=47
-'->'=61
-'.'=76
-'..'=63
-'..<'=62
-'/'=70
-'/='=49
-':'=83
-'::'=77
-';'=37
-'<'=51
-'<>'=65
-'='=42
-'=='=56
-'==='=58
-'=>'=64
-'>'=52
-'>='=53
-'?'=104
-'?.'=78
-'?:'=66
-'@'=38
-'['=44
-']'=45
-'accordionSubmenu'=17
-'as'=73
-'case'=85
-'catch'=103
-'collapsedImage'=16
-'default'=84
-'describedBy'=23
-'designer'=20
-'dialog'=29
-'do'=88
-'else'=81
-'entry'=22
-'expandedImage'=15
-'extends'=91
-'extension'=34
-'false'=94
-'finally'=101
-'for'=86
-'height'=18
-'if'=80
-'image'=24
-'import'=32
-'instanceof'=60
-'keyBinding'=31
-'new'=93
-'ns'=36
-'null'=96
+'!'=74
+'!='=59
+'!=='=61
+'#'=45
+'%'=73
+'%='=52
+'&&'=57
+'&'=107
+'('=41
+')'=43
+'*'=37
+'**'=71
+'*='=50
+'+'=69
+'++'=76
+'+='=48
+','=42
+'-'=70
+'--'=77
+'-='=49
+'->'=63
+'.'=78
+'..'=65
+'..<'=64
+'/'=72
+'/='=51
+':'=85
+'::'=79
+';'=39
+'<'=53
+'<>'=67
+'='=44
+'=='=58
+'==='=60
+'=>'=66
+'>'=54
+'>='=55
+'?'=106
+'?.'=80
+'?:'=68
+'@'=40
+'['=46
+']'=47
+'as'=75
+'case'=87
+'catch'=105
+'category'=19
+'collapsedImage'=15
+'default'=86
+'designer'=18
+'dialog'=21
+'do'=90
+'else'=83
+'entry'=30
+'expandedImage'=14
+'extends'=93
+'extension'=36
+'false'=96
+'finally'=103
+'for'=88
+'height'=16
+'icon'=31
+'if'=82
+'import'=34
+'instanceof'=62
+'keyBinding'=24
+'new'=95
+'ns'=38
+'null'=98
 'package'=13
-'perspective'=27
-'process'=26
-'return'=99
-'showBadge'=25
-'static'=33
-'super'=92
-'switch'=82
-'synchronized'=102
-'table'=28
-'throw'=98
-'true'=95
-'try'=100
-'typeof'=97
-'userFilter'=30
-'val'=90
-'var'=89
-'while'=87
-'width'=19
-'{'=14
-'|'=79
-'||'=54
-'}'=21
+'perspective'=33
+'process'=32
+'reportPrinter'=23
+'return'=101
+'static'=35
+'super'=94
+'switch'=84
+'synchronized'=104
+'systemSettings'=25
+'table'=20
+'throw'=100
+'tooltip'=29
+'tree'=28
+'true'=97
+'try'=102
+'typeof'=99
+'userFilter'=22
+'val'=92
+'var'=91
+'while'=89
+'width'=17
+'{'=26
+'|'=81
+'||'=56
+'}'=27
 RULE_ANY_OTHER=12
 RULE_DECIMAL=8
 RULE_HEX=6
@@ -106,6 +108,8 @@ T__102=102
 T__103=103
 T__104=104
 T__105=105
+T__106=106
+T__107=107
 T__13=13
 T__14=14
 T__15=15
diff --git a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslLexer.java b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslLexer.java
index 0accbff..2ea53eb 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslLexer.java
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslLexer.java
@@ -108,11 +108,13 @@ public class InternalMenuDslLexer extends Lexer {
     public static final int RULE_ANY_OTHER=12;
     public static final int T__88=88;
     public static final int T__89=89;
+    public static final int T__107=107;
     public static final int T__84=84;
     public static final int T__104=104;
     public static final int T__85=85;
     public static final int T__103=103;
     public static final int T__86=86;
+    public static final int T__106=106;
     public static final int T__87=87;
     public static final int T__105=105;
 
@@ -155,10 +157,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:12:7: ( '{' )
-            // InternalMenuDsl.g:12:9: '{'
+            // InternalMenuDsl.g:12:7: ( 'expandedImage' )
+            // InternalMenuDsl.g:12:9: 'expandedImage'
             {
-            match('{'); 
+            match("expandedImage"); 
+
 
             }
 
@@ -175,10 +178,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:13:7: ( 'expandedImage' )
-            // InternalMenuDsl.g:13:9: 'expandedImage'
+            // InternalMenuDsl.g:13:7: ( 'collapsedImage' )
+            // InternalMenuDsl.g:13:9: 'collapsedImage'
             {
-            match("expandedImage"); 
+            match("collapsedImage"); 
 
 
             }
@@ -196,10 +199,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:14:7: ( 'collapsedImage' )
-            // InternalMenuDsl.g:14:9: 'collapsedImage'
+            // InternalMenuDsl.g:14:7: ( 'height' )
+            // InternalMenuDsl.g:14:9: 'height'
             {
-            match("collapsedImage"); 
+            match("height"); 
 
 
             }
@@ -217,10 +220,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:15:7: ( 'accordionSubmenu' )
-            // InternalMenuDsl.g:15:9: 'accordionSubmenu'
+            // InternalMenuDsl.g:15:7: ( 'width' )
+            // InternalMenuDsl.g:15:9: 'width'
             {
-            match("accordionSubmenu"); 
+            match("width"); 
 
 
             }
@@ -238,10 +241,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:16:7: ( 'height' )
-            // InternalMenuDsl.g:16:9: 'height'
+            // InternalMenuDsl.g:16:7: ( 'designer' )
+            // InternalMenuDsl.g:16:9: 'designer'
             {
-            match("height"); 
+            match("designer"); 
 
 
             }
@@ -259,10 +262,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:17:7: ( 'width' )
-            // InternalMenuDsl.g:17:9: 'width'
+            // InternalMenuDsl.g:17:7: ( 'category' )
+            // InternalMenuDsl.g:17:9: 'category'
             {
-            match("width"); 
+            match("category"); 
 
 
             }
@@ -280,10 +283,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:18:7: ( 'designer' )
-            // InternalMenuDsl.g:18:9: 'designer'
+            // InternalMenuDsl.g:18:7: ( 'table' )
+            // InternalMenuDsl.g:18:9: 'table'
             {
-            match("designer"); 
+            match("table"); 
 
 
             }
@@ -301,10 +304,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:19:7: ( '}' )
-            // InternalMenuDsl.g:19:9: '}'
+            // InternalMenuDsl.g:19:7: ( 'dialog' )
+            // InternalMenuDsl.g:19:9: 'dialog'
             {
-            match('}'); 
+            match("dialog"); 
+
 
             }
 
@@ -321,10 +325,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:20:7: ( 'entry' )
-            // InternalMenuDsl.g:20:9: 'entry'
+            // InternalMenuDsl.g:20:7: ( 'userFilter' )
+            // InternalMenuDsl.g:20:9: 'userFilter'
             {
-            match("entry"); 
+            match("userFilter"); 
 
 
             }
@@ -342,10 +346,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:21:7: ( 'describedBy' )
-            // InternalMenuDsl.g:21:9: 'describedBy'
+            // InternalMenuDsl.g:21:7: ( 'reportPrinter' )
+            // InternalMenuDsl.g:21:9: 'reportPrinter'
             {
-            match("describedBy"); 
+            match("reportPrinter"); 
 
 
             }
@@ -363,10 +367,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:22:7: ( 'image' )
-            // InternalMenuDsl.g:22:9: 'image'
+            // InternalMenuDsl.g:22:7: ( 'keyBinding' )
+            // InternalMenuDsl.g:22:9: 'keyBinding'
             {
-            match("image"); 
+            match("keyBinding"); 
 
 
             }
@@ -384,10 +388,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:23:7: ( 'showBadge' )
-            // InternalMenuDsl.g:23:9: 'showBadge'
+            // InternalMenuDsl.g:23:7: ( 'systemSettings' )
+            // InternalMenuDsl.g:23:9: 'systemSettings'
             {
-            match("showBadge"); 
+            match("systemSettings"); 
 
 
             }
@@ -405,11 +409,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:24:7: ( 'process' )
-            // InternalMenuDsl.g:24:9: 'process'
+            // InternalMenuDsl.g:24:7: ( '{' )
+            // InternalMenuDsl.g:24:9: '{'
             {
-            match("process"); 
-
+            match('{'); 
 
             }
 
@@ -426,11 +429,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:25:7: ( 'perspective' )
-            // InternalMenuDsl.g:25:9: 'perspective'
+            // InternalMenuDsl.g:25:7: ( '}' )
+            // InternalMenuDsl.g:25:9: '}'
             {
-            match("perspective"); 
-
+            match('}'); 
 
             }
 
@@ -447,10 +449,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:26:7: ( 'table' )
-            // InternalMenuDsl.g:26:9: 'table'
+            // InternalMenuDsl.g:26:7: ( 'tree' )
+            // InternalMenuDsl.g:26:9: 'tree'
             {
-            match("table"); 
+            match("tree"); 
 
 
             }
@@ -468,10 +470,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:27:7: ( 'dialog' )
-            // InternalMenuDsl.g:27:9: 'dialog'
+            // InternalMenuDsl.g:27:7: ( 'tooltip' )
+            // InternalMenuDsl.g:27:9: 'tooltip'
             {
-            match("dialog"); 
+            match("tooltip"); 
 
 
             }
@@ -489,10 +491,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:28:7: ( 'userFilter' )
-            // InternalMenuDsl.g:28:9: 'userFilter'
+            // InternalMenuDsl.g:28:7: ( 'entry' )
+            // InternalMenuDsl.g:28:9: 'entry'
             {
-            match("userFilter"); 
+            match("entry"); 
 
 
             }
@@ -510,10 +512,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:29:7: ( 'keyBinding' )
-            // InternalMenuDsl.g:29:9: 'keyBinding'
+            // InternalMenuDsl.g:29:7: ( 'icon' )
+            // InternalMenuDsl.g:29:9: 'icon'
             {
-            match("keyBinding"); 
+            match("icon"); 
 
 
             }
@@ -531,10 +533,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:30:7: ( 'import' )
-            // InternalMenuDsl.g:30:9: 'import'
+            // InternalMenuDsl.g:30:7: ( 'process' )
+            // InternalMenuDsl.g:30:9: 'process'
             {
-            match("import"); 
+            match("process"); 
 
 
             }
@@ -552,10 +554,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:31:7: ( 'static' )
-            // InternalMenuDsl.g:31:9: 'static'
+            // InternalMenuDsl.g:31:7: ( 'perspective' )
+            // InternalMenuDsl.g:31:9: 'perspective'
             {
-            match("static"); 
+            match("perspective"); 
 
 
             }
@@ -573,10 +575,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:32:7: ( 'extension' )
-            // InternalMenuDsl.g:32:9: 'extension'
+            // InternalMenuDsl.g:32:7: ( 'import' )
+            // InternalMenuDsl.g:32:9: 'import'
             {
-            match("extension"); 
+            match("import"); 
 
 
             }
@@ -594,10 +596,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:33:7: ( '*' )
-            // InternalMenuDsl.g:33:9: '*'
+            // InternalMenuDsl.g:33:7: ( 'static' )
+            // InternalMenuDsl.g:33:9: 'static'
             {
-            match('*'); 
+            match("static"); 
+
 
             }
 
@@ -614,10 +617,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:34:7: ( 'ns' )
-            // InternalMenuDsl.g:34:9: 'ns'
+            // InternalMenuDsl.g:34:7: ( 'extension' )
+            // InternalMenuDsl.g:34:9: 'extension'
             {
-            match("ns"); 
+            match("extension"); 
 
 
             }
@@ -635,10 +638,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:35:7: ( ';' )
-            // InternalMenuDsl.g:35:9: ';'
+            // InternalMenuDsl.g:35:7: ( '*' )
+            // InternalMenuDsl.g:35:9: '*'
             {
-            match(';'); 
+            match('*'); 
 
             }
 
@@ -655,10 +658,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:36:7: ( '@' )
-            // InternalMenuDsl.g:36:9: '@'
+            // InternalMenuDsl.g:36:7: ( 'ns' )
+            // InternalMenuDsl.g:36:9: 'ns'
             {
-            match('@'); 
+            match("ns"); 
+
 
             }
 
@@ -675,10 +679,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:37:7: ( '(' )
-            // InternalMenuDsl.g:37:9: '('
+            // InternalMenuDsl.g:37:7: ( ';' )
+            // InternalMenuDsl.g:37:9: ';'
             {
-            match('('); 
+            match(';'); 
 
             }
 
@@ -695,10 +699,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:38:7: ( ',' )
-            // InternalMenuDsl.g:38:9: ','
+            // InternalMenuDsl.g:38:7: ( '@' )
+            // InternalMenuDsl.g:38:9: '@'
             {
-            match(','); 
+            match('@'); 
 
             }
 
@@ -715,10 +719,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:39:7: ( ')' )
-            // InternalMenuDsl.g:39:9: ')'
+            // InternalMenuDsl.g:39:7: ( '(' )
+            // InternalMenuDsl.g:39:9: '('
             {
-            match(')'); 
+            match('('); 
 
             }
 
@@ -735,10 +739,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:40:7: ( '=' )
-            // InternalMenuDsl.g:40:9: '='
+            // InternalMenuDsl.g:40:7: ( ',' )
+            // InternalMenuDsl.g:40:9: ','
             {
-            match('='); 
+            match(','); 
 
             }
 
@@ -755,10 +759,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:41:7: ( '#' )
-            // InternalMenuDsl.g:41:9: '#'
+            // InternalMenuDsl.g:41:7: ( ')' )
+            // InternalMenuDsl.g:41:9: ')'
             {
-            match('#'); 
+            match(')'); 
 
             }
 
@@ -775,10 +779,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:42:7: ( '[' )
-            // InternalMenuDsl.g:42:9: '['
+            // InternalMenuDsl.g:42:7: ( '=' )
+            // InternalMenuDsl.g:42:9: '='
             {
-            match('['); 
+            match('='); 
 
             }
 
@@ -795,10 +799,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:43:7: ( ']' )
-            // InternalMenuDsl.g:43:9: ']'
+            // InternalMenuDsl.g:43:7: ( '#' )
+            // InternalMenuDsl.g:43:9: '#'
             {
-            match(']'); 
+            match('#'); 
 
             }
 
@@ -815,11 +819,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:44:7: ( '+=' )
-            // InternalMenuDsl.g:44:9: '+='
+            // InternalMenuDsl.g:44:7: ( '[' )
+            // InternalMenuDsl.g:44:9: '['
             {
-            match("+="); 
-
+            match('['); 
 
             }
 
@@ -836,11 +839,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:45:7: ( '-=' )
-            // InternalMenuDsl.g:45:9: '-='
+            // InternalMenuDsl.g:45:7: ( ']' )
+            // InternalMenuDsl.g:45:9: ']'
             {
-            match("-="); 
-
+            match(']'); 
 
             }
 
@@ -857,10 +859,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:46:7: ( '*=' )
-            // InternalMenuDsl.g:46:9: '*='
+            // InternalMenuDsl.g:46:7: ( '+=' )
+            // InternalMenuDsl.g:46:9: '+='
             {
-            match("*="); 
+            match("+="); 
 
 
             }
@@ -878,10 +880,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:47:7: ( '/=' )
-            // InternalMenuDsl.g:47:9: '/='
+            // InternalMenuDsl.g:47:7: ( '-=' )
+            // InternalMenuDsl.g:47:9: '-='
             {
-            match("/="); 
+            match("-="); 
 
 
             }
@@ -899,10 +901,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:48:7: ( '%=' )
-            // InternalMenuDsl.g:48:9: '%='
+            // InternalMenuDsl.g:48:7: ( '*=' )
+            // InternalMenuDsl.g:48:9: '*='
             {
-            match("%="); 
+            match("*="); 
 
 
             }
@@ -920,10 +922,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:49:7: ( '<' )
-            // InternalMenuDsl.g:49:9: '<'
+            // InternalMenuDsl.g:49:7: ( '/=' )
+            // InternalMenuDsl.g:49:9: '/='
             {
-            match('<'); 
+            match("/="); 
+
 
             }
 
@@ -940,10 +943,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:50:7: ( '>' )
-            // InternalMenuDsl.g:50:9: '>'
+            // InternalMenuDsl.g:50:7: ( '%=' )
+            // InternalMenuDsl.g:50:9: '%='
             {
-            match('>'); 
+            match("%="); 
+
 
             }
 
@@ -960,11 +964,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:51:7: ( '>=' )
-            // InternalMenuDsl.g:51:9: '>='
+            // InternalMenuDsl.g:51:7: ( '<' )
+            // InternalMenuDsl.g:51:9: '<'
             {
-            match(">="); 
-
+            match('<'); 
 
             }
 
@@ -981,11 +984,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:52:7: ( '||' )
-            // InternalMenuDsl.g:52:9: '||'
+            // InternalMenuDsl.g:52:7: ( '>' )
+            // InternalMenuDsl.g:52:9: '>'
             {
-            match("||"); 
-
+            match('>'); 
 
             }
 
@@ -1002,10 +1004,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:53:7: ( '&&' )
-            // InternalMenuDsl.g:53:9: '&&'
+            // InternalMenuDsl.g:53:7: ( '>=' )
+            // InternalMenuDsl.g:53:9: '>='
             {
-            match("&&"); 
+            match(">="); 
 
 
             }
@@ -1023,10 +1025,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:54:7: ( '==' )
-            // InternalMenuDsl.g:54:9: '=='
+            // InternalMenuDsl.g:54:7: ( '||' )
+            // InternalMenuDsl.g:54:9: '||'
             {
-            match("=="); 
+            match("||"); 
 
 
             }
@@ -1044,10 +1046,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:55:7: ( '!=' )
-            // InternalMenuDsl.g:55:9: '!='
+            // InternalMenuDsl.g:55:7: ( '&&' )
+            // InternalMenuDsl.g:55:9: '&&'
             {
-            match("!="); 
+            match("&&"); 
 
 
             }
@@ -1065,10 +1067,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:56:7: ( '===' )
-            // InternalMenuDsl.g:56:9: '==='
+            // InternalMenuDsl.g:56:7: ( '==' )
+            // InternalMenuDsl.g:56:9: '=='
             {
-            match("==="); 
+            match("=="); 
 
 
             }
@@ -1086,10 +1088,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:57:7: ( '!==' )
-            // InternalMenuDsl.g:57:9: '!=='
+            // InternalMenuDsl.g:57:7: ( '!=' )
+            // InternalMenuDsl.g:57:9: '!='
             {
-            match("!=="); 
+            match("!="); 
 
 
             }
@@ -1107,10 +1109,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:58:7: ( 'instanceof' )
-            // InternalMenuDsl.g:58:9: 'instanceof'
+            // InternalMenuDsl.g:58:7: ( '===' )
+            // InternalMenuDsl.g:58:9: '==='
             {
-            match("instanceof"); 
+            match("==="); 
 
 
             }
@@ -1128,10 +1130,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:59:7: ( '->' )
-            // InternalMenuDsl.g:59:9: '->'
+            // InternalMenuDsl.g:59:7: ( '!==' )
+            // InternalMenuDsl.g:59:9: '!=='
             {
-            match("->"); 
+            match("!=="); 
 
 
             }
@@ -1149,10 +1151,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:60:7: ( '..<' )
-            // InternalMenuDsl.g:60:9: '..<'
+            // InternalMenuDsl.g:60:7: ( 'instanceof' )
+            // InternalMenuDsl.g:60:9: 'instanceof'
             {
-            match("..<"); 
+            match("instanceof"); 
 
 
             }
@@ -1170,10 +1172,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:61:7: ( '..' )
-            // InternalMenuDsl.g:61:9: '..'
+            // InternalMenuDsl.g:61:7: ( '->' )
+            // InternalMenuDsl.g:61:9: '->'
             {
-            match(".."); 
+            match("->"); 
 
 
             }
@@ -1191,10 +1193,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:62:7: ( '=>' )
-            // InternalMenuDsl.g:62:9: '=>'
+            // InternalMenuDsl.g:62:7: ( '..<' )
+            // InternalMenuDsl.g:62:9: '..<'
             {
-            match("=>"); 
+            match("..<"); 
 
 
             }
@@ -1212,10 +1214,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:63:7: ( '<>' )
-            // InternalMenuDsl.g:63:9: '<>'
+            // InternalMenuDsl.g:63:7: ( '..' )
+            // InternalMenuDsl.g:63:9: '..'
             {
-            match("<>"); 
+            match(".."); 
 
 
             }
@@ -1233,10 +1235,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:64:7: ( '?:' )
-            // InternalMenuDsl.g:64:9: '?:'
+            // InternalMenuDsl.g:64:7: ( '=>' )
+            // InternalMenuDsl.g:64:9: '=>'
             {
-            match("?:"); 
+            match("=>"); 
 
 
             }
@@ -1254,10 +1256,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:65:7: ( '+' )
-            // InternalMenuDsl.g:65:9: '+'
+            // InternalMenuDsl.g:65:7: ( '<>' )
+            // InternalMenuDsl.g:65:9: '<>'
             {
-            match('+'); 
+            match("<>"); 
+
 
             }
 
@@ -1274,10 +1277,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:66:7: ( '-' )
-            // InternalMenuDsl.g:66:9: '-'
+            // InternalMenuDsl.g:66:7: ( '?:' )
+            // InternalMenuDsl.g:66:9: '?:'
             {
-            match('-'); 
+            match("?:"); 
+
 
             }
 
@@ -1294,11 +1298,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:67:7: ( '**' )
-            // InternalMenuDsl.g:67:9: '**'
+            // InternalMenuDsl.g:67:7: ( '+' )
+            // InternalMenuDsl.g:67:9: '+'
             {
-            match("**"); 
-
+            match('+'); 
 
             }
 
@@ -1315,10 +1318,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:68:7: ( '/' )
-            // InternalMenuDsl.g:68:9: '/'
+            // InternalMenuDsl.g:68:7: ( '-' )
+            // InternalMenuDsl.g:68:9: '-'
             {
-            match('/'); 
+            match('-'); 
 
             }
 
@@ -1335,10 +1338,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:69:7: ( '%' )
-            // InternalMenuDsl.g:69:9: '%'
+            // InternalMenuDsl.g:69:7: ( '**' )
+            // InternalMenuDsl.g:69:9: '**'
             {
-            match('%'); 
+            match("**"); 
+
 
             }
 
@@ -1355,10 +1359,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:70:7: ( '!' )
-            // InternalMenuDsl.g:70:9: '!'
+            // InternalMenuDsl.g:70:7: ( '/' )
+            // InternalMenuDsl.g:70:9: '/'
             {
-            match('!'); 
+            match('/'); 
 
             }
 
@@ -1375,11 +1379,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:71:7: ( 'as' )
-            // InternalMenuDsl.g:71:9: 'as'
+            // InternalMenuDsl.g:71:7: ( '%' )
+            // InternalMenuDsl.g:71:9: '%'
             {
-            match("as"); 
-
+            match('%'); 
 
             }
 
@@ -1396,11 +1399,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:72:7: ( '++' )
-            // InternalMenuDsl.g:72:9: '++'
+            // InternalMenuDsl.g:72:7: ( '!' )
+            // InternalMenuDsl.g:72:9: '!'
             {
-            match("++"); 
-
+            match('!'); 
 
             }
 
@@ -1417,10 +1419,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:73:7: ( '--' )
-            // InternalMenuDsl.g:73:9: '--'
+            // InternalMenuDsl.g:73:7: ( 'as' )
+            // InternalMenuDsl.g:73:9: 'as'
             {
-            match("--"); 
+            match("as"); 
 
 
             }
@@ -1438,10 +1440,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:74:7: ( '.' )
-            // InternalMenuDsl.g:74:9: '.'
+            // InternalMenuDsl.g:74:7: ( '++' )
+            // InternalMenuDsl.g:74:9: '++'
             {
-            match('.'); 
+            match("++"); 
+
 
             }
 
@@ -1458,10 +1461,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:75:7: ( '::' )
-            // InternalMenuDsl.g:75:9: '::'
+            // InternalMenuDsl.g:75:7: ( '--' )
+            // InternalMenuDsl.g:75:9: '--'
             {
-            match("::"); 
+            match("--"); 
 
 
             }
@@ -1479,11 +1482,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:76:7: ( '?.' )
-            // InternalMenuDsl.g:76:9: '?.'
+            // InternalMenuDsl.g:76:7: ( '.' )
+            // InternalMenuDsl.g:76:9: '.'
             {
-            match("?."); 
-
+            match('.'); 
 
             }
 
@@ -1500,10 +1502,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:77:7: ( '|' )
-            // InternalMenuDsl.g:77:9: '|'
+            // InternalMenuDsl.g:77:7: ( '::' )
+            // InternalMenuDsl.g:77:9: '::'
             {
-            match('|'); 
+            match("::"); 
+
 
             }
 
@@ -1520,10 +1523,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:78:7: ( 'if' )
-            // InternalMenuDsl.g:78:9: 'if'
+            // InternalMenuDsl.g:78:7: ( '?.' )
+            // InternalMenuDsl.g:78:9: '?.'
             {
-            match("if"); 
+            match("?."); 
 
 
             }
@@ -1541,11 +1544,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:79:7: ( 'else' )
-            // InternalMenuDsl.g:79:9: 'else'
+            // InternalMenuDsl.g:79:7: ( '|' )
+            // InternalMenuDsl.g:79:9: '|'
             {
-            match("else"); 
-
+            match('|'); 
 
             }
 
@@ -1562,10 +1564,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:80:7: ( 'switch' )
-            // InternalMenuDsl.g:80:9: 'switch'
+            // InternalMenuDsl.g:80:7: ( 'if' )
+            // InternalMenuDsl.g:80:9: 'if'
             {
-            match("switch"); 
+            match("if"); 
 
 
             }
@@ -1583,10 +1585,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:81:7: ( ':' )
-            // InternalMenuDsl.g:81:9: ':'
+            // InternalMenuDsl.g:81:7: ( 'else' )
+            // InternalMenuDsl.g:81:9: 'else'
             {
-            match(':'); 
+            match("else"); 
+
 
             }
 
@@ -1603,10 +1606,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:82:7: ( 'default' )
-            // InternalMenuDsl.g:82:9: 'default'
+            // InternalMenuDsl.g:82:7: ( 'switch' )
+            // InternalMenuDsl.g:82:9: 'switch'
             {
-            match("default"); 
+            match("switch"); 
 
 
             }
@@ -1624,11 +1627,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:83:7: ( 'case' )
-            // InternalMenuDsl.g:83:9: 'case'
+            // InternalMenuDsl.g:83:7: ( ':' )
+            // InternalMenuDsl.g:83:9: ':'
             {
-            match("case"); 
-
+            match(':'); 
 
             }
 
@@ -1645,10 +1647,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:84:7: ( 'for' )
-            // InternalMenuDsl.g:84:9: 'for'
+            // InternalMenuDsl.g:84:7: ( 'default' )
+            // InternalMenuDsl.g:84:9: 'default'
             {
-            match("for"); 
+            match("default"); 
 
 
             }
@@ -1666,10 +1668,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:85:7: ( 'while' )
-            // InternalMenuDsl.g:85:9: 'while'
+            // InternalMenuDsl.g:85:7: ( 'case' )
+            // InternalMenuDsl.g:85:9: 'case'
             {
-            match("while"); 
+            match("case"); 
 
 
             }
@@ -1687,10 +1689,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:86:7: ( 'do' )
-            // InternalMenuDsl.g:86:9: 'do'
+            // InternalMenuDsl.g:86:7: ( 'for' )
+            // InternalMenuDsl.g:86:9: 'for'
             {
-            match("do"); 
+            match("for"); 
 
 
             }
@@ -1708,10 +1710,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:87:7: ( 'var' )
-            // InternalMenuDsl.g:87:9: 'var'
+            // InternalMenuDsl.g:87:7: ( 'while' )
+            // InternalMenuDsl.g:87:9: 'while'
             {
-            match("var"); 
+            match("while"); 
 
 
             }
@@ -1729,10 +1731,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:88:7: ( 'val' )
-            // InternalMenuDsl.g:88:9: 'val'
+            // InternalMenuDsl.g:88:7: ( 'do' )
+            // InternalMenuDsl.g:88:9: 'do'
             {
-            match("val"); 
+            match("do"); 
 
 
             }
@@ -1750,10 +1752,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:89:7: ( 'extends' )
-            // InternalMenuDsl.g:89:9: 'extends'
+            // InternalMenuDsl.g:89:7: ( 'var' )
+            // InternalMenuDsl.g:89:9: 'var'
             {
-            match("extends"); 
+            match("var"); 
 
 
             }
@@ -1771,10 +1773,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:90:7: ( 'super' )
-            // InternalMenuDsl.g:90:9: 'super'
+            // InternalMenuDsl.g:90:7: ( 'val' )
+            // InternalMenuDsl.g:90:9: 'val'
             {
-            match("super"); 
+            match("val"); 
 
 
             }
@@ -1792,10 +1794,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:91:7: ( 'new' )
-            // InternalMenuDsl.g:91:9: 'new'
+            // InternalMenuDsl.g:91:7: ( 'extends' )
+            // InternalMenuDsl.g:91:9: 'extends'
             {
-            match("new"); 
+            match("extends"); 
 
 
             }
@@ -1813,10 +1815,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:92:7: ( 'false' )
-            // InternalMenuDsl.g:92:9: 'false'
+            // InternalMenuDsl.g:92:7: ( 'super' )
+            // InternalMenuDsl.g:92:9: 'super'
             {
-            match("false"); 
+            match("super"); 
 
 
             }
@@ -1834,10 +1836,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:93:7: ( 'true' )
-            // InternalMenuDsl.g:93:9: 'true'
+            // InternalMenuDsl.g:93:7: ( 'new' )
+            // InternalMenuDsl.g:93:9: 'new'
             {
-            match("true"); 
+            match("new"); 
 
 
             }
@@ -1855,10 +1857,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:94:7: ( 'null' )
-            // InternalMenuDsl.g:94:9: 'null'
+            // InternalMenuDsl.g:94:7: ( 'false' )
+            // InternalMenuDsl.g:94:9: 'false'
             {
-            match("null"); 
+            match("false"); 
 
 
             }
@@ -1876,10 +1878,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:95:7: ( 'typeof' )
-            // InternalMenuDsl.g:95:9: 'typeof'
+            // InternalMenuDsl.g:95:7: ( 'true' )
+            // InternalMenuDsl.g:95:9: 'true'
             {
-            match("typeof"); 
+            match("true"); 
 
 
             }
@@ -1897,10 +1899,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:96:7: ( 'throw' )
-            // InternalMenuDsl.g:96:9: 'throw'
+            // InternalMenuDsl.g:96:7: ( 'null' )
+            // InternalMenuDsl.g:96:9: 'null'
             {
-            match("throw"); 
+            match("null"); 
 
 
             }
@@ -1918,10 +1920,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:97:7: ( 'return' )
-            // InternalMenuDsl.g:97:9: 'return'
+            // InternalMenuDsl.g:97:7: ( 'typeof' )
+            // InternalMenuDsl.g:97:9: 'typeof'
             {
-            match("return"); 
+            match("typeof"); 
 
 
             }
@@ -1939,10 +1941,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:98:8: ( 'try' )
-            // InternalMenuDsl.g:98:10: 'try'
+            // InternalMenuDsl.g:98:8: ( 'throw' )
+            // InternalMenuDsl.g:98:10: 'throw'
             {
-            match("try"); 
+            match("throw"); 
 
 
             }
@@ -1960,10 +1962,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:99:8: ( 'finally' )
-            // InternalMenuDsl.g:99:10: 'finally'
+            // InternalMenuDsl.g:99:8: ( 'return' )
+            // InternalMenuDsl.g:99:10: 'return'
             {
-            match("finally"); 
+            match("return"); 
 
 
             }
@@ -1981,10 +1983,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:100:8: ( 'synchronized' )
-            // InternalMenuDsl.g:100:10: 'synchronized'
+            // InternalMenuDsl.g:100:8: ( 'try' )
+            // InternalMenuDsl.g:100:10: 'try'
             {
-            match("synchronized"); 
+            match("try"); 
 
 
             }
@@ -2002,10 +2004,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:101:8: ( 'catch' )
-            // InternalMenuDsl.g:101:10: 'catch'
+            // InternalMenuDsl.g:101:8: ( 'finally' )
+            // InternalMenuDsl.g:101:10: 'finally'
             {
-            match("catch"); 
+            match("finally"); 
 
 
             }
@@ -2023,10 +2025,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:102:8: ( '?' )
-            // InternalMenuDsl.g:102:10: '?'
+            // InternalMenuDsl.g:102:8: ( 'synchronized' )
+            // InternalMenuDsl.g:102:10: 'synchronized'
             {
-            match('?'); 
+            match("synchronized"); 
+
 
             }
 
@@ -2043,10 +2046,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:103:8: ( '&' )
-            // InternalMenuDsl.g:103:10: '&'
+            // InternalMenuDsl.g:103:8: ( 'catch' )
+            // InternalMenuDsl.g:103:10: 'catch'
             {
-            match('&'); 
+            match("catch"); 
+
 
             }
 
@@ -2058,15 +2062,55 @@ public class InternalMenuDslLexer extends Lexer {
     }
     // $ANTLR end "T__105"
 
+    // $ANTLR start "T__106"
+    public final void mT__106() throws RecognitionException {
+        try {
+            int _type = T__106;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalMenuDsl.g:104:8: ( '?' )
+            // InternalMenuDsl.g:104:10: '?'
+            {
+            match('?'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__106"
+
+    // $ANTLR start "T__107"
+    public final void mT__107() throws RecognitionException {
+        try {
+            int _type = T__107;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalMenuDsl.g:105:8: ( '&' )
+            // InternalMenuDsl.g:105:10: '&'
+            {
+            match('&'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__107"
+
     // $ANTLR start "RULE_HEX"
     public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7539:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // InternalMenuDsl.g:7539:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalMenuDsl.g:7639:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalMenuDsl.g:7639:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // InternalMenuDsl.g:7539:12: ( '0x' | '0X' )
+            // InternalMenuDsl.g:7639:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2094,7 +2138,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // InternalMenuDsl.g:7539:13: '0x'
+                    // InternalMenuDsl.g:7639:13: '0x'
                     {
                     match("0x"); 
 
@@ -2102,7 +2146,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:7539:18: '0X'
+                    // InternalMenuDsl.g:7639:18: '0X'
                     {
                     match("0X"); 
 
@@ -2112,7 +2156,7 @@ public class InternalMenuDslLexer extends Lexer {
 
             }
 
-            // InternalMenuDsl.g:7539:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalMenuDsl.g:7639:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -2150,7 +2194,7 @@ public class InternalMenuDslLexer extends Lexer {
                 cnt2++;
             } while (true);
 
-            // InternalMenuDsl.g:7539:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalMenuDsl.g:7639:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2159,10 +2203,10 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalMenuDsl.g:7539:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalMenuDsl.g:7639:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // InternalMenuDsl.g:7539:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalMenuDsl.g:7639:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -2180,7 +2224,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt3) {
                         case 1 :
-                            // InternalMenuDsl.g:7539:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalMenuDsl.g:7639:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2204,7 +2248,7 @@ public class InternalMenuDslLexer extends Lexer {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:7539:84: ( 'l' | 'L' )
+                            // InternalMenuDsl.g:7639:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2243,11 +2287,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7541:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // InternalMenuDsl.g:7541:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalMenuDsl.g:7641:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalMenuDsl.g:7641:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // InternalMenuDsl.g:7541:21: ( '0' .. '9' | '_' )*
+            // InternalMenuDsl.g:7641:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -2296,11 +2340,11 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7543:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // InternalMenuDsl.g:7543:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalMenuDsl.g:7643:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalMenuDsl.g:7643:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // InternalMenuDsl.g:7543:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalMenuDsl.g:7643:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2309,7 +2353,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt7) {
                 case 1 :
-                    // InternalMenuDsl.g:7543:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalMenuDsl.g:7643:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2320,7 +2364,7 @@ public class InternalMenuDslLexer extends Lexer {
                         recover(mse);
                         throw mse;}
 
-                    // InternalMenuDsl.g:7543:36: ( '+' | '-' )?
+                    // InternalMenuDsl.g:7643:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2353,7 +2397,7 @@ public class InternalMenuDslLexer extends Lexer {
 
             }
 
-            // InternalMenuDsl.g:7543:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalMenuDsl.g:7643:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2365,7 +2409,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt8) {
                 case 1 :
-                    // InternalMenuDsl.g:7543:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalMenuDsl.g:7643:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2389,7 +2433,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:7543:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalMenuDsl.g:7643: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();
@@ -2422,10 +2466,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7545:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // InternalMenuDsl.g:7545:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalMenuDsl.g:7645:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalMenuDsl.g:7645:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // InternalMenuDsl.g:7545:11: ( '^' )?
+            // InternalMenuDsl.g:7645:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2434,7 +2478,7 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalMenuDsl.g:7545:11: '^'
+                    // InternalMenuDsl.g:7645:11: '^'
                     {
                     match('^'); 
 
@@ -2452,7 +2496,7 @@ public class InternalMenuDslLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalMenuDsl.g:7545:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalMenuDsl.g:7645:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2501,10 +2545,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7547:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // InternalMenuDsl.g:7547:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalMenuDsl.g:7647:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalMenuDsl.g:7647:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // InternalMenuDsl.g:7547:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalMenuDsl.g:7647:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2522,10 +2566,10 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt15) {
                 case 1 :
-                    // InternalMenuDsl.g:7547:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalMenuDsl.g:7647:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // InternalMenuDsl.g:7547:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalMenuDsl.g:7647:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2541,7 +2585,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                         switch (alt11) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:7547:21: '\\\\' .
+                    	    // InternalMenuDsl.g:7647:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2549,7 +2593,7 @@ public class InternalMenuDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalMenuDsl.g:7547:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalMenuDsl.g:7647:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2569,7 +2613,7 @@ public class InternalMenuDslLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalMenuDsl.g:7547:44: ( '\"' )?
+                    // InternalMenuDsl.g:7647:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2578,7 +2622,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt12) {
                         case 1 :
-                            // InternalMenuDsl.g:7547:44: '\"'
+                            // InternalMenuDsl.g:7647:44: '\"'
                             {
                             match('\"'); 
 
@@ -2591,10 +2635,10 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:7547:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalMenuDsl.g:7647:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // InternalMenuDsl.g:7547:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalMenuDsl.g:7647:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2610,7 +2654,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                         switch (alt13) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:7547:55: '\\\\' .
+                    	    // InternalMenuDsl.g:7647:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2618,7 +2662,7 @@ public class InternalMenuDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalMenuDsl.g:7547:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalMenuDsl.g:7647:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2638,7 +2682,7 @@ public class InternalMenuDslLexer extends Lexer {
                         }
                     } while (true);
 
-                    // InternalMenuDsl.g:7547:79: ( '\\'' )?
+                    // InternalMenuDsl.g:7647:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2647,7 +2691,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt14) {
                         case 1 :
-                            // InternalMenuDsl.g:7547:79: '\\''
+                            // InternalMenuDsl.g:7647:79: '\\''
                             {
                             match('\''); 
 
@@ -2678,12 +2722,12 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7549:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalMenuDsl.g:7549:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalMenuDsl.g:7649:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalMenuDsl.g:7649:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalMenuDsl.g:7549:24: ( options {greedy=false; } : . )*
+            // InternalMenuDsl.g:7649:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2708,7 +2752,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                 switch (alt16) {
             	case 1 :
-            	    // InternalMenuDsl.g:7549:52: .
+            	    // InternalMenuDsl.g:7649:52: .
             	    {
             	    matchAny(); 
 
@@ -2738,12 +2782,12 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7551:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalMenuDsl.g:7551:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalMenuDsl.g:7651:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalMenuDsl.g:7651:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalMenuDsl.g:7551:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalMenuDsl.g:7651:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2756,7 +2800,7 @@ public class InternalMenuDslLexer extends Lexer {
 
                 switch (alt17) {
             	case 1 :
-            	    // InternalMenuDsl.g:7551:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalMenuDsl.g:7651: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();
@@ -2776,7 +2820,7 @@ public class InternalMenuDslLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalMenuDsl.g:7551:40: ( ( '\\r' )? '\\n' )?
+            // InternalMenuDsl.g:7651:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2785,9 +2829,9 @@ public class InternalMenuDslLexer extends Lexer {
             }
             switch (alt19) {
                 case 1 :
-                    // InternalMenuDsl.g:7551:41: ( '\\r' )? '\\n'
+                    // InternalMenuDsl.g:7651:41: ( '\\r' )? '\\n'
                     {
-                    // InternalMenuDsl.g:7551:41: ( '\\r' )?
+                    // InternalMenuDsl.g:7651:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2796,7 +2840,7 @@ public class InternalMenuDslLexer extends Lexer {
                     }
                     switch (alt18) {
                         case 1 :
-                            // InternalMenuDsl.g:7551:41: '\\r'
+                            // InternalMenuDsl.g:7651:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2828,10 +2872,10 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7553:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalMenuDsl.g:7553:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalMenuDsl.g:7653:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalMenuDsl.g:7653:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalMenuDsl.g:7553:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalMenuDsl.g:7653:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2885,8 +2929,8 @@ public class InternalMenuDslLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalMenuDsl.g:7555:16: ( . )
-            // InternalMenuDsl.g:7555:18: .
+            // InternalMenuDsl.g:7655:16: ( . )
+            // InternalMenuDsl.g:7655:18: .
             {
             matchAny(); 
 
@@ -2901,8 +2945,8 @@ public class InternalMenuDslLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalMenuDsl.g:1:8: ( T__13 | T__14 | 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 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt21=102;
+        // InternalMenuDsl.g:1:8: ( T__13 | T__14 | 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 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt21=104;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
@@ -3557,63 +3601,77 @@ public class InternalMenuDslLexer extends Lexer {
                 }
                 break;
             case 94 :
-                // InternalMenuDsl.g:1:574: RULE_HEX
+                // InternalMenuDsl.g:1:574: T__106
                 {
-                mRULE_HEX(); 
+                mT__106(); 
 
                 }
                 break;
             case 95 :
-                // InternalMenuDsl.g:1:583: RULE_INT
+                // InternalMenuDsl.g:1:581: T__107
                 {
-                mRULE_INT(); 
+                mT__107(); 
 
                 }
                 break;
             case 96 :
-                // InternalMenuDsl.g:1:592: RULE_DECIMAL
+                // InternalMenuDsl.g:1:588: RULE_HEX
                 {
-                mRULE_DECIMAL(); 
+                mRULE_HEX(); 
 
                 }
                 break;
             case 97 :
-                // InternalMenuDsl.g:1:605: RULE_ID
+                // InternalMenuDsl.g:1:597: RULE_INT
                 {
-                mRULE_ID(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 98 :
-                // InternalMenuDsl.g:1:613: RULE_STRING
+                // InternalMenuDsl.g:1:606: RULE_DECIMAL
                 {
-                mRULE_STRING(); 
+                mRULE_DECIMAL(); 
 
                 }
                 break;
             case 99 :
-                // InternalMenuDsl.g:1:625: RULE_ML_COMMENT
+                // InternalMenuDsl.g:1:619: RULE_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 100 :
-                // InternalMenuDsl.g:1:641: RULE_SL_COMMENT
+                // InternalMenuDsl.g:1:627: RULE_STRING
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 101 :
-                // InternalMenuDsl.g:1:657: RULE_WS
+                // InternalMenuDsl.g:1:639: RULE_ML_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 102 :
-                // InternalMenuDsl.g:1:665: RULE_ANY_OTHER
+                // InternalMenuDsl.g:1:655: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 103 :
+                // InternalMenuDsl.g:1:671: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 104 :
+                // InternalMenuDsl.g:1:679: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3627,33 +3685,33 @@ public class InternalMenuDslLexer extends Lexer {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\1\64\1\uffff\6\64\1\uffff\5\64\1\124\1\64\5\uffff\1\137\3\uffff\1\145\1\151\1\155\1\157\1\161\1\163\1\165\1\167\1\171\1\173\1\176\1\u0080\3\64\2\u0088\1\60\5\uffff\3\64\2\uffff\6\64\1\u0097\5\64\1\u009e\1\uffff\2\64\1\u00a2\13\64\3\uffff\1\u00af\2\64\5\uffff\1\u00b3\32\uffff\1\u00b5\1\uffff\1\u00b7\6\uffff\5\64\1\uffff\1\u0088\4\uffff\13\64\1\uffff\6\64\1\uffff\3\64\1\uffff\7\64\1\u00da\4\64\1\uffff\1\u00df\1\64\6\uffff\1\u00e1\2\64\1\u00e4\1\u00e5\7\64\1\u00ed\1\64\1\u00ef\22\64\1\u0102\1\uffff\4\64\1\uffff\1\u0107\1\uffff\2\64\2\uffff\6\64\1\u0111\1\uffff\1\64\1\uffff\1\u0113\2\64\1\u0116\1\u0117\4\64\1\u011c\5\64\1\u0122\1\64\1\u0124\1\uffff\1\64\1\u0126\2\64\1\uffff\1\u0129\10\64\1\uffff\1\64\1\uffff\1\64\1\u0134\2\uffff\3\64\1\u0138\1\uffff\1\u0139\2\64\1\u013c\1\u013d\1\uffff\1\64\1\uffff\1\u013f\1\uffff\2\64\1\uffff\1\64\1\u0143\1\u0144\1\u0145\3\64\1\u0149\2\64\1\uffff\2\64\1\u014e\2\uffff\2\64\2\uffff\1\64\1\uffff\2\64\1\u0154\3\uffff\3\64\1\uffff\2\64\1\u015a\1\64\1\uffff\5\64\1\uffff\2\64\1\u0163\2\64\1\uffff\2\64\1\u0168\5\64\1\uffff\3\64\1\u0171\1\uffff\1\64\1\u0173\1\u0174\1\u0175\3\64\1\u0179\1\uffff\1\64\3\uffff\3\64\1\uffff\1\u017e\1\u017f\2\64\2\uffff\1\u0182\1\64\1\uffff\1\64\1\u0185\1\uffff";
+        "\1\uffff\13\64\2\uffff\1\64\1\124\1\64\5\uffff\1\137\3\uffff\1\145\1\151\1\155\1\157\1\161\1\163\1\165\1\167\1\171\1\173\1\176\1\64\1\u0081\2\64\2\u0088\1\60\5\uffff\3\64\1\uffff\12\64\1\u009c\14\64\2\uffff\3\64\1\u00b0\3\uffff\1\u00b1\2\64\5\uffff\1\u00b5\32\uffff\1\u00b7\1\uffff\1\u00b9\4\uffff\1\u00ba\2\uffff\4\64\1\uffff\1\u0088\4\uffff\20\64\1\uffff\3\64\1\u00d4\17\64\2\uffff\1\u00e4\1\64\7\uffff\1\u00e6\2\64\1\u00e9\1\u00ea\6\64\1\u00f1\3\64\1\u00f5\7\64\1\u00fd\1\u00fe\1\uffff\14\64\1\u010b\2\64\1\uffff\1\u010e\1\uffff\2\64\2\uffff\5\64\1\u0117\1\uffff\2\64\1\u011a\1\uffff\1\64\1\u011c\1\u011d\3\64\1\u0121\2\uffff\2\64\1\u0124\10\64\1\u012d\1\uffff\2\64\1\uffff\1\u0130\7\64\1\uffff\2\64\1\uffff\1\u013a\2\uffff\2\64\1\u013d\1\uffff\1\64\1\u013f\1\uffff\2\64\1\u0142\3\64\1\u0146\1\u0147\1\uffff\1\u0148\1\64\1\uffff\1\64\1\u014b\1\u014c\3\64\1\u0150\2\64\1\uffff\1\64\1\u0154\1\uffff\1\u0155\1\uffff\2\64\1\uffff\3\64\3\uffff\1\64\1\u015c\2\uffff\3\64\1\uffff\1\64\1\u0161\1\u0162\2\uffff\6\64\1\uffff\2\64\1\u016b\1\64\2\uffff\10\64\1\uffff\1\64\1\u0176\1\64\1\u0178\2\64\1\u017b\1\u017c\2\64\1\uffff\1\64\1\uffff\2\64\2\uffff\4\64\1\u0186\1\u0187\1\64\1\u0189\1\64\2\uffff\1\u018b\1\uffff\1\u018c\2\uffff";
     static final String DFA21_eofS =
-        "\u0186\uffff";
+        "\u018d\uffff";
     static final String DFA21_minS =
-        "\1\0\1\141\1\uffff\1\154\1\141\1\143\1\145\1\150\1\145\1\uffff\1\146\1\150\1\141\1\163\1\145\1\52\1\145\5\uffff\1\75\3\uffff\1\53\1\55\1\52\1\75\1\76\1\75\1\174\1\46\1\75\2\56\1\72\2\141\1\145\2\60\1\44\5\uffff\1\143\1\157\1\162\2\uffff\1\160\1\164\1\163\1\154\1\163\1\143\1\44\1\151\1\144\1\151\1\146\1\141\1\44\1\uffff\1\141\1\163\1\44\1\157\1\141\1\151\1\160\1\156\1\142\1\165\1\160\1\162\1\145\1\171\3\uffff\1\44\1\167\1\154\5\uffff\1\75\32\uffff\1\75\1\uffff\1\74\6\uffff\1\162\1\154\1\156\1\154\1\164\1\uffff\1\60\4\uffff\1\153\1\143\1\163\1\141\1\145\1\162\1\145\1\154\1\145\1\143\1\157\1\uffff\1\147\1\164\1\154\1\143\1\141\1\154\1\uffff\1\147\1\157\1\164\1\uffff\1\167\2\164\1\145\1\143\1\154\1\145\1\44\1\145\1\157\1\162\1\102\1\uffff\1\44\1\154\6\uffff\1\44\1\163\1\141\2\44\1\165\1\141\1\145\1\160\2\156\1\171\1\44\1\141\1\44\1\150\1\162\2\150\1\145\1\147\1\162\1\165\1\157\1\145\1\162\1\141\1\102\1\151\1\143\1\162\1\150\1\145\1\44\1\uffff\1\157\1\167\1\106\1\151\1\uffff\1\44\1\uffff\1\145\1\154\2\uffff\1\162\1\147\1\163\1\145\2\144\1\44\1\uffff\1\160\1\uffff\1\44\1\144\1\164\2\44\1\156\1\151\1\154\1\147\1\44\1\164\1\156\1\141\1\143\1\150\1\44\1\162\1\44\1\uffff\1\146\1\44\1\151\1\156\1\uffff\1\44\1\154\1\156\1\145\1\163\1\143\1\145\1\151\1\163\1\uffff\1\163\1\uffff\1\151\1\44\2\uffff\1\145\1\142\1\164\1\44\1\uffff\1\44\1\143\1\144\2\44\1\uffff\1\157\1\uffff\1\44\1\uffff\1\154\1\144\1\uffff\1\171\3\44\1\164\1\144\1\157\1\44\1\145\1\157\1\uffff\1\162\1\145\1\44\2\uffff\1\145\1\147\2\uffff\1\156\1\uffff\1\164\1\151\1\44\3\uffff\1\151\1\111\1\156\1\uffff\1\144\1\156\1\44\1\144\1\uffff\1\157\1\145\1\151\1\145\1\156\1\uffff\1\166\1\155\1\44\1\111\1\123\1\uffff\1\102\1\146\1\44\1\172\1\162\1\147\1\145\1\141\1\uffff\1\155\1\165\1\171\1\44\1\uffff\1\145\3\44\1\147\1\141\1\142\1\44\1\uffff\1\144\3\uffff\1\145\1\147\1\155\1\uffff\2\44\2\145\2\uffff\1\44\1\156\1\uffff\1\165\1\44\1\uffff";
+        "\1\0\1\141\1\154\1\141\1\145\1\150\1\145\1\141\1\163\2\145\1\164\2\uffff\1\143\1\52\1\145\5\uffff\1\75\3\uffff\1\53\1\55\1\52\1\75\1\76\1\75\1\174\1\46\1\75\2\56\1\163\1\72\2\141\2\60\1\44\5\uffff\1\143\1\157\1\162\1\uffff\1\160\1\164\1\163\1\154\1\163\1\151\1\144\1\151\1\146\1\141\1\44\1\142\1\145\1\157\1\160\1\162\1\145\1\160\1\171\1\156\1\141\1\151\1\160\2\uffff\1\157\1\160\1\163\1\44\3\uffff\1\44\1\167\1\154\5\uffff\1\75\32\uffff\1\75\1\uffff\1\74\4\uffff\1\44\2\uffff\1\162\1\154\1\156\1\154\1\uffff\1\60\4\uffff\1\153\1\143\1\163\1\141\1\145\1\162\1\145\1\154\1\143\1\145\1\147\1\164\1\154\1\151\1\141\1\154\1\uffff\1\154\2\145\1\44\1\154\1\145\1\157\1\162\1\157\1\165\1\102\1\164\1\143\2\164\1\145\1\156\1\157\1\164\2\uffff\1\44\1\154\7\uffff\1\44\1\163\1\141\2\44\1\141\1\145\1\160\2\156\1\171\1\44\1\141\1\147\1\150\1\44\2\150\1\145\1\147\1\165\1\157\1\145\2\44\1\uffff\1\164\1\157\1\167\1\106\2\162\1\151\1\145\1\150\1\151\1\143\1\162\1\44\1\162\1\141\1\uffff\1\44\1\uffff\1\145\1\154\2\uffff\1\147\1\163\1\145\2\144\1\44\1\uffff\1\160\1\157\1\44\1\uffff\1\164\2\44\1\156\1\154\1\147\1\44\2\uffff\1\151\1\146\1\44\1\151\1\164\2\156\1\155\1\162\1\143\1\150\1\44\1\uffff\1\164\1\156\1\uffff\1\44\1\154\1\145\1\163\1\143\1\145\1\151\1\163\1\uffff\1\163\1\162\1\uffff\1\44\2\uffff\1\145\1\164\1\44\1\uffff\1\160\1\44\1\uffff\1\154\1\120\1\44\1\144\1\123\1\157\2\44\1\uffff\1\44\1\143\1\uffff\1\171\2\44\1\164\1\144\1\157\1\44\1\145\1\171\1\uffff\1\162\1\44\1\uffff\1\44\1\uffff\1\164\1\162\1\uffff\1\151\1\145\1\156\3\uffff\1\145\1\44\2\uffff\1\151\1\111\1\156\1\uffff\1\144\2\44\2\uffff\1\145\1\151\1\156\1\164\1\151\1\157\1\uffff\1\166\1\155\1\44\1\111\2\uffff\1\162\1\156\1\147\1\164\1\172\1\146\1\145\1\141\1\uffff\1\155\1\44\1\164\1\44\1\151\1\145\2\44\1\147\1\141\1\uffff\1\145\1\uffff\1\156\1\144\2\uffff\1\145\1\147\1\162\1\147\2\44\1\145\1\44\1\163\2\uffff\1\44\1\uffff\1\44\2\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\162\1\uffff\1\170\1\157\1\163\1\145\1\151\1\157\1\uffff\1\156\2\171\1\163\1\145\1\75\1\165\5\uffff\1\76\3\uffff\1\75\1\76\2\75\1\76\1\75\1\174\1\46\1\75\1\56\2\72\1\157\1\141\1\145\1\170\1\154\1\172\5\uffff\1\143\1\157\1\162\2\uffff\2\164\1\163\1\154\1\164\1\143\1\172\1\151\1\144\1\151\1\163\1\141\1\172\1\uffff\1\160\1\163\1\172\1\157\1\141\1\151\1\160\1\156\1\142\1\171\1\160\1\162\1\145\1\171\3\uffff\1\172\1\167\1\154\5\uffff\1\75\32\uffff\1\75\1\uffff\1\74\6\uffff\1\162\1\154\1\156\1\162\1\164\1\uffff\1\154\4\uffff\1\153\1\143\1\163\1\141\1\145\1\162\1\145\1\154\1\145\1\143\1\157\1\uffff\1\147\1\164\1\154\1\151\1\141\1\154\1\uffff\1\147\1\157\1\164\1\uffff\1\167\2\164\1\145\1\143\1\154\1\145\1\172\1\145\1\157\1\162\1\102\1\uffff\1\172\1\154\6\uffff\1\172\1\163\1\141\2\172\1\165\1\141\1\145\1\160\2\156\1\171\1\172\1\141\1\172\1\150\1\162\2\150\1\145\1\147\1\162\1\165\1\157\1\145\1\162\1\141\1\102\1\151\1\143\1\162\1\150\1\145\1\172\1\uffff\1\157\1\167\1\106\1\151\1\uffff\1\172\1\uffff\1\145\1\154\2\uffff\1\162\1\147\1\163\1\145\1\144\1\163\1\172\1\uffff\1\160\1\uffff\1\172\1\144\1\164\2\172\1\156\1\151\1\154\1\147\1\172\1\164\1\156\1\141\1\143\1\150\1\172\1\162\1\172\1\uffff\1\146\1\172\1\151\1\156\1\uffff\1\172\1\154\1\156\1\145\1\163\1\143\1\145\1\151\1\163\1\uffff\1\163\1\uffff\1\151\1\172\2\uffff\1\145\1\142\1\164\1\172\1\uffff\1\172\1\143\1\144\2\172\1\uffff\1\157\1\uffff\1\172\1\uffff\1\154\1\144\1\uffff\1\171\3\172\1\164\1\144\1\157\1\172\1\145\1\157\1\uffff\1\162\1\145\1\172\2\uffff\1\145\1\147\2\uffff\1\156\1\uffff\1\164\1\151\1\172\3\uffff\1\151\1\111\1\156\1\uffff\1\144\1\156\1\172\1\144\1\uffff\1\157\1\145\1\151\1\145\1\156\1\uffff\1\166\1\155\1\172\1\111\1\123\1\uffff\1\102\1\146\2\172\1\162\1\147\1\145\1\141\1\uffff\1\155\1\165\1\171\1\172\1\uffff\1\145\3\172\1\147\1\141\1\142\1\172\1\uffff\1\144\3\uffff\1\145\1\147\1\155\1\uffff\2\172\2\145\2\uffff\1\172\1\156\1\uffff\1\165\1\172\1\uffff";
+        "\1\uffff\1\162\1\170\1\157\1\145\1\151\1\157\1\171\1\163\2\145\1\171\2\uffff\1\156\1\75\1\165\5\uffff\1\76\3\uffff\1\75\1\76\2\75\1\76\1\75\1\174\1\46\1\75\1\56\1\72\1\163\1\72\1\157\1\141\1\170\1\154\1\172\5\uffff\1\143\1\157\1\162\1\uffff\2\164\1\163\1\154\1\164\1\151\1\144\1\151\1\163\1\141\1\172\1\142\1\171\1\157\1\160\1\162\1\145\1\164\1\171\1\163\1\141\1\151\1\160\2\uffff\1\157\1\160\1\163\1\172\3\uffff\1\172\1\167\1\154\5\uffff\1\75\32\uffff\1\75\1\uffff\1\74\4\uffff\1\172\2\uffff\1\162\1\154\1\156\1\162\1\uffff\1\154\4\uffff\1\153\1\143\1\163\1\141\1\145\1\162\1\145\1\154\2\145\1\147\1\164\1\154\1\151\1\141\1\154\1\uffff\1\154\2\145\1\172\1\154\1\145\1\157\1\162\1\157\1\165\1\102\1\164\1\143\2\164\1\145\1\156\1\157\1\164\2\uffff\1\172\1\154\7\uffff\1\172\1\163\1\141\2\172\1\141\1\145\1\160\2\156\1\171\1\172\1\141\1\147\1\150\1\172\2\150\1\145\1\147\1\165\1\157\1\145\2\172\1\uffff\1\164\1\157\1\167\1\106\2\162\1\151\1\145\1\150\1\151\1\143\1\162\1\172\1\162\1\141\1\uffff\1\172\1\uffff\1\145\1\154\2\uffff\1\147\1\163\1\145\1\144\1\163\1\172\1\uffff\1\160\1\157\1\172\1\uffff\1\164\2\172\1\156\1\154\1\147\1\172\2\uffff\1\151\1\146\1\172\1\151\1\164\2\156\1\155\1\162\1\143\1\150\1\172\1\uffff\1\164\1\156\1\uffff\1\172\1\154\1\145\1\163\1\143\1\145\1\151\1\163\1\uffff\1\163\1\162\1\uffff\1\172\2\uffff\1\145\1\164\1\172\1\uffff\1\160\1\172\1\uffff\1\154\1\120\1\172\1\144\1\123\1\157\2\172\1\uffff\1\172\1\143\1\uffff\1\171\2\172\1\164\1\144\1\157\1\172\1\145\1\171\1\uffff\1\162\1\172\1\uffff\1\172\1\uffff\1\164\1\162\1\uffff\1\151\1\145\1\156\3\uffff\1\145\1\172\2\uffff\1\151\1\111\1\156\1\uffff\1\144\2\172\2\uffff\1\145\1\151\1\156\1\164\1\151\1\157\1\uffff\1\166\1\155\1\172\1\111\2\uffff\1\162\1\156\1\147\1\164\1\172\1\146\1\145\1\141\1\uffff\1\155\1\172\1\164\1\172\1\151\1\145\2\172\1\147\1\141\1\uffff\1\145\1\uffff\1\156\1\144\2\uffff\1\145\1\147\1\162\1\147\2\172\1\145\1\172\1\163\2\uffff\1\172\1\uffff\1\172\2\uffff";
     static final String DFA21_acceptS =
-        "\2\uffff\1\2\6\uffff\1\11\7\uffff\1\31\1\32\1\33\1\34\1\35\1\uffff\1\37\1\40\1\41\22\uffff\1\141\2\142\1\145\1\146\3\uffff\1\141\1\2\15\uffff\1\11\16\uffff\1\44\1\71\1\27\3\uffff\1\31\1\32\1\33\1\34\1\35\1\uffff\1\64\1\36\1\37\1\40\1\41\1\42\1\76\1\67\1\43\1\61\1\77\1\70\1\45\1\143\1\144\1\72\1\46\1\73\1\65\1\47\1\51\1\50\1\52\1\103\1\53\1\135\1\uffff\1\74\1\uffff\1\100\1\66\1\102\1\134\1\101\1\107\5\uffff\1\136\1\uffff\1\137\1\140\1\142\1\145\13\uffff\1\75\6\uffff\1\114\3\uffff\1\104\14\uffff\1\30\2\uffff\1\56\1\54\1\57\1\55\1\62\1\63\42\uffff\1\130\4\uffff\1\121\1\uffff\1\112\2\uffff\1\115\1\116\7\uffff\1\105\1\uffff\1\111\22\uffff\1\123\4\uffff\1\124\11\uffff\1\12\1\uffff\1\133\2\uffff\1\7\1\113\4\uffff\1\14\5\uffff\1\120\1\uffff\1\20\1\uffff\1\126\2\uffff\1\122\12\uffff\1\6\3\uffff\1\21\1\24\2\uffff\1\25\1\106\1\uffff\1\125\3\uffff\1\127\1\1\1\16\3\uffff\1\117\4\uffff\1\110\5\uffff\1\131\5\uffff\1\10\10\uffff\1\26\4\uffff\1\15\10\uffff\1\60\1\uffff\1\22\1\23\1\17\3\uffff\1\13\4\uffff\1\132\1\3\2\uffff\1\4\2\uffff\1\5";
+        "\14\uffff\1\16\1\17\3\uffff\1\33\1\34\1\35\1\36\1\37\1\uffff\1\41\1\42\1\43\22\uffff\1\143\2\144\1\147\1\150\3\uffff\1\143\27\uffff\1\16\1\17\4\uffff\1\46\1\73\1\31\3\uffff\1\33\1\34\1\35\1\36\1\37\1\uffff\1\66\1\40\1\41\1\42\1\43\1\44\1\100\1\71\1\45\1\63\1\101\1\72\1\47\1\145\1\146\1\74\1\50\1\75\1\67\1\51\1\53\1\52\1\54\1\105\1\55\1\137\1\uffff\1\76\1\uffff\1\102\1\70\1\104\1\136\1\uffff\1\103\1\111\4\uffff\1\140\1\uffff\1\141\1\142\1\144\1\147\20\uffff\1\116\23\uffff\1\106\1\32\2\uffff\1\60\1\56\1\61\1\57\1\64\1\65\1\77\31\uffff\1\132\17\uffff\1\123\1\uffff\1\114\2\uffff\1\117\1\120\6\uffff\1\107\3\uffff\1\113\7\uffff\1\20\1\125\14\uffff\1\23\2\uffff\1\126\10\uffff\1\22\2\uffff\1\135\1\uffff\1\5\1\115\3\uffff\1\10\2\uffff\1\130\10\uffff\1\122\2\uffff\1\124\11\uffff\1\4\2\uffff\1\11\1\uffff\1\127\2\uffff\1\131\3\uffff\1\27\1\110\1\26\2\uffff\1\1\1\24\3\uffff\1\121\3\uffff\1\112\1\21\6\uffff\1\133\4\uffff\1\7\1\6\10\uffff\1\30\12\uffff\1\12\1\uffff\1\14\2\uffff\1\62\1\25\11\uffff\1\134\1\2\1\uffff\1\13\1\uffff\1\3\1\15";
     static final String DFA21_specialS =
-        "\1\0\u0185\uffff}>";
+        "\1\0\u018c\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\60\2\57\2\60\1\57\22\60\1\57\1\42\1\55\1\27\1\54\1\35\1\41\1\56\1\23\1\25\1\17\1\32\1\24\1\33\1\43\1\34\1\51\11\52\1\45\1\21\1\36\1\26\1\37\1\44\1\22\32\54\1\30\1\60\1\31\1\53\1\54\1\60\1\5\1\54\1\4\1\10\1\3\1\46\1\54\1\6\1\12\1\54\1\16\2\54\1\20\1\54\1\1\1\54\1\50\1\13\1\14\1\15\1\47\1\7\3\54\1\2\1\40\1\11\uff82\60",
+            "\11\60\2\57\2\60\1\57\22\60\1\57\1\42\1\55\1\27\1\54\1\35\1\41\1\56\1\23\1\25\1\17\1\32\1\24\1\33\1\43\1\34\1\51\11\52\1\46\1\21\1\36\1\26\1\37\1\44\1\22\32\54\1\30\1\60\1\31\1\53\1\54\1\60\1\45\1\54\1\3\1\6\1\2\1\47\1\54\1\4\1\16\1\54\1\12\2\54\1\20\1\54\1\1\1\54\1\11\1\13\1\7\1\10\1\50\1\5\3\54\1\14\1\40\1\15\uff82\60",
             "\1\61\3\uffff\1\63\14\uffff\1\62",
+            "\1\67\1\uffff\1\66\11\uffff\1\65",
+            "\1\71\15\uffff\1\70",
+            "\1\72",
+            "\1\74\1\73",
+            "\1\75\3\uffff\1\76\5\uffff\1\77",
+            "\1\100\6\uffff\1\104\6\uffff\1\102\2\uffff\1\101\6\uffff\1\103",
+            "\1\105",
+            "\1\106",
+            "\1\107",
+            "\1\111\1\113\1\uffff\1\112\1\uffff\1\110",
             "",
-            "\1\70\1\uffff\1\67\11\uffff\1\66",
-            "\1\72\15\uffff\1\71",
-            "\1\73\17\uffff\1\74",
-            "\1\75",
-            "\1\77\1\76",
-            "\1\100\3\uffff\1\101\5\uffff\1\102",
             "",
-            "\1\106\6\uffff\1\104\1\105",
-            "\1\107\13\uffff\1\110\1\112\1\uffff\1\111\1\uffff\1\113",
-            "\1\114\6\uffff\1\117\11\uffff\1\115\6\uffff\1\116",
-            "\1\120",
-            "\1\121",
+            "\1\116\2\uffff\1\121\6\uffff\1\117\1\120",
             "\1\123\22\uffff\1\122",
             "\1\126\15\uffff\1\125\1\uffff\1\127",
             "",
@@ -3677,8 +3735,8 @@ public class InternalMenuDslLexer extends Lexer {
             "\1\172",
             "\1\175\13\uffff\1\174",
             "\1\177",
-            "\1\u0082\7\uffff\1\u0083\5\uffff\1\u0081",
-            "\1\u0084",
+            "\1\u0080",
+            "\1\u0083\7\uffff\1\u0084\5\uffff\1\u0082",
             "\1\u0085",
             "\12\u0087\10\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089\13\uffff\1\u0086\6\uffff\1\u0087\2\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089\13\uffff\1\u0086",
             "\12\u0087\10\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089\22\uffff\1\u0087\2\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089",
@@ -3692,48 +3750,47 @@ public class InternalMenuDslLexer extends Lexer {
             "\1\u008d",
             "\1\u008e",
             "",
-            "",
             "\1\u008f\3\uffff\1\u0090",
             "\1\u0091",
             "\1\u0092",
             "\1\u0093",
-            "\1\u0094\1\u0095",
+            "\1\u0095\1\u0094",
             "\1\u0096",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0097",
             "\1\u0098",
-            "\1\u0099",
-            "\1\u009a",
-            "\1\u009c\14\uffff\1\u009b",
-            "\1\u009d",
+            "\1\u009a\14\uffff\1\u0099",
+            "\1\u009b",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "",
-            "\1\u009f\16\uffff\1\u00a0",
+            "\1\u009d",
+            "\1\u009e\17\uffff\1\u009f\3\uffff\1\u00a0",
             "\1\u00a1",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u00a2",
             "\1\u00a3",
             "\1\u00a4",
-            "\1\u00a5",
-            "\1\u00a6",
+            "\1\u00a5\3\uffff\1\u00a6",
             "\1\u00a7",
-            "\1\u00a8",
-            "\1\u00a9\3\uffff\1\u00aa",
+            "\1\u00a9\4\uffff\1\u00a8",
+            "\1\u00aa",
             "\1\u00ab",
             "\1\u00ac",
+            "",
+            "",
             "\1\u00ad",
             "\1\u00ae",
+            "\1\u00af",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
             "",
             "",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u00b0",
-            "\1\u00b1",
-            "",
+            "\1\u00b2",
+            "\1\u00b3",
             "",
             "",
             "",
             "",
-            "\1\u00b2",
             "",
+            "\1\u00b4",
             "",
             "",
             "",
@@ -3759,28 +3816,27 @@ public class InternalMenuDslLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u00b4",
             "",
             "\1\u00b6",
             "",
+            "\1\u00b8",
+            "",
             "",
             "",
             "",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
             "",
-            "\1\u00b8",
-            "\1\u00b9",
-            "\1\u00ba",
-            "\1\u00bc\5\uffff\1\u00bb",
+            "\1\u00bb",
+            "\1\u00bc",
             "\1\u00bd",
+            "\1\u00bf\5\uffff\1\u00be",
             "",
             "\12\u0087\10\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089\22\uffff\1\u0087\2\uffff\1\u0089\1\uffff\3\u0089\5\uffff\1\u0089",
             "",
             "",
             "",
             "",
-            "\1\u00be",
-            "\1\u00bf",
             "\1\u00c0",
             "\1\u00c1",
             "\1\u00c2",
@@ -3789,34 +3845,39 @@ public class InternalMenuDslLexer extends Lexer {
             "\1\u00c5",
             "\1\u00c6",
             "\1\u00c7",
-            "\1\u00c8",
-            "",
-            "\1\u00c9",
+            "\1\u00c9\1\uffff\1\u00c8",
             "\1\u00ca",
             "\1\u00cb",
-            "\1\u00cd\5\uffff\1\u00cc",
+            "\1\u00cc",
+            "\1\u00cd",
             "\1\u00ce",
             "\1\u00cf",
-            "",
             "\1\u00d0",
+            "",
             "\1\u00d1",
             "\1\u00d2",
-            "",
             "\1\u00d3",
-            "\1\u00d4",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u00d5",
             "\1\u00d6",
             "\1\u00d7",
             "\1\u00d8",
             "\1\u00d9",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u00da",
             "\1\u00db",
             "\1\u00dc",
             "\1\u00dd",
             "\1\u00de",
+            "\1\u00df",
+            "\1\u00e0",
+            "\1\u00e1",
+            "\1\u00e2",
+            "\1\u00e3",
+            "",
             "",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u00e0",
+            "\1\u00e5",
+            "",
             "",
             "",
             "",
@@ -3824,26 +3885,21 @@ public class InternalMenuDslLexer extends Lexer {
             "",
             "",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u00e2",
-            "\1\u00e3",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u00e6",
             "\1\u00e7",
             "\1\u00e8",
-            "\1\u00e9",
-            "\1\u00ea",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u00eb",
             "\1\u00ec",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u00ed",
             "\1\u00ee",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u00ef",
             "\1\u00f0",
-            "\1\u00f1",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u00f2",
             "\1\u00f3",
             "\1\u00f4",
-            "\1\u00f5",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u00f6",
             "\1\u00f7",
             "\1\u00f8",
@@ -3851,183 +3907,192 @@ public class InternalMenuDslLexer extends Lexer {
             "\1\u00fa",
             "\1\u00fb",
             "\1\u00fc",
-            "\1\u00fd",
-            "\1\u00fe",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
             "\1\u00ff",
             "\1\u0100",
             "\1\u0101",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "",
+            "\1\u0102",
             "\1\u0103",
             "\1\u0104",
             "\1\u0105",
             "\1\u0106",
-            "",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "",
+            "\1\u0107",
             "\1\u0108",
             "\1\u0109",
-            "",
-            "",
             "\1\u010a",
-            "\1\u010b",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u010c",
             "\1\u010d",
-            "\1\u010e",
-            "\1\u0110\16\uffff\1\u010f",
+            "",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
-            "\1\u0112",
+            "\1\u010f",
+            "\1\u0110",
             "",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
+            "\1\u0111",
+            "\1\u0112",
+            "\1\u0113",
             "\1\u0114",
-            "\1\u0115",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0116\16\uffff\1\u0115",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
             "\1\u0118",
             "\1\u0119",
-            "\1\u011a",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
             "\1\u011b",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u011d",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u011e",
             "\1\u011f",
             "\1\u0120",
-            "\1\u0121",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
+            "",
+            "\1\u0122",
             "\1\u0123",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "",
             "\1\u0125",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0126",
             "\1\u0127",
             "\1\u0128",
-            "",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0129",
             "\1\u012a",
             "\1\u012b",
             "\1\u012c",
-            "\1\u012d",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
             "\1\u012e",
             "\1\u012f",
-            "\1\u0130",
-            "\1\u0131",
             "",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0131",
             "\1\u0132",
-            "",
             "\1\u0133",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "",
-            "",
+            "\1\u0134",
             "\1\u0135",
             "\1\u0136",
             "\1\u0137",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
+            "\1\u0138",
+            "\1\u0139",
             "",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u013a",
+            "",
+            "",
             "\1\u013b",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u013c",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
             "\1\u013e",
-            "",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
             "\1\u0140",
             "\1\u0141",
-            "",
-            "\1\u0142",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0143",
+            "\1\u0144",
+            "\1\u0145",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u0146",
-            "\1\u0147",
-            "\1\u0148",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u014a",
-            "\1\u014b",
             "",
-            "\1\u014c",
-            "\1\u014d",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0149",
             "",
-            "",
+            "\1\u014a",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u014d",
+            "\1\u014e",
             "\1\u014f",
-            "\1\u0150",
-            "",
-            "",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u0151",
-            "",
             "\1\u0152",
+            "",
             "\1\u0153",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
-            "",
-            "\1\u0155",
             "\1\u0156",
             "\1\u0157",
             "",
             "\1\u0158",
             "\1\u0159",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u015a",
+            "",
+            "",
+            "",
             "\1\u015b",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
             "",
-            "\1\u015c",
             "\1\u015d",
             "\1\u015e",
             "\1\u015f",
-            "\1\u0160",
             "",
-            "\1\u0161",
-            "\1\u0162",
+            "\1\u0160",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
+            "",
+            "\1\u0163",
             "\1\u0164",
             "\1\u0165",
-            "",
             "\1\u0166",
             "\1\u0167",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u0168",
+            "",
             "\1\u0169",
             "\1\u016a",
-            "\1\u016b",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u016c",
-            "\1\u016d",
             "",
+            "",
+            "\1\u016d",
             "\1\u016e",
             "\1\u016f",
             "\1\u0170",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "",
+            "\1\u0171",
             "\1\u0172",
+            "\1\u0173",
+            "\1\u0174",
+            "",
+            "\1\u0175",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u0176",
             "\1\u0177",
-            "\1\u0178",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "",
+            "\1\u0179",
             "\1\u017a",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u017d",
+            "\1\u017e",
             "",
+            "\1\u017f",
             "",
+            "\1\u0180",
+            "\1\u0181",
             "",
-            "\1\u017b",
-            "\1\u017c",
-            "\1\u017d",
             "",
+            "\1\u0182",
+            "\1\u0183",
+            "\1\u0184",
+            "\1\u0185",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u0180",
-            "\1\u0181",
+            "\1\u0188",
+            "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "\1\u018a",
             "",
             "",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\1\u0183",
             "",
-            "\1\u0184",
             "\1\64\13\uffff\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
+            "",
             ""
     };
 
@@ -4061,7 +4126,7 @@ public class InternalMenuDslLexer extends Lexer {
             this.transition = DFA21_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__13 | T__14 | 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 | 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__13 | T__14 | 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 | 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;
@@ -4073,31 +4138,31 @@ public class InternalMenuDslLexer extends Lexer {
                         s = -1;
                         if ( (LA21_0=='p') ) {s = 1;}
 
-                        else if ( (LA21_0=='{') ) {s = 2;}
+                        else if ( (LA21_0=='e') ) {s = 2;}
 
-                        else if ( (LA21_0=='e') ) {s = 3;}
+                        else if ( (LA21_0=='c') ) {s = 3;}
 
-                        else if ( (LA21_0=='c') ) {s = 4;}
+                        else if ( (LA21_0=='h') ) {s = 4;}
 
-                        else if ( (LA21_0=='a') ) {s = 5;}
+                        else if ( (LA21_0=='w') ) {s = 5;}
 
-                        else if ( (LA21_0=='h') ) {s = 6;}
+                        else if ( (LA21_0=='d') ) {s = 6;}
 
-                        else if ( (LA21_0=='w') ) {s = 7;}
+                        else if ( (LA21_0=='t') ) {s = 7;}
 
-                        else if ( (LA21_0=='d') ) {s = 8;}
+                        else if ( (LA21_0=='u') ) {s = 8;}
 
-                        else if ( (LA21_0=='}') ) {s = 9;}
+                        else if ( (LA21_0=='r') ) {s = 9;}
 
-                        else if ( (LA21_0=='i') ) {s = 10;}
+                        else if ( (LA21_0=='k') ) {s = 10;}
 
                         else if ( (LA21_0=='s') ) {s = 11;}
 
-                        else if ( (LA21_0=='t') ) {s = 12;}
+                        else if ( (LA21_0=='{') ) {s = 12;}
 
-                        else if ( (LA21_0=='u') ) {s = 13;}
+                        else if ( (LA21_0=='}') ) {s = 13;}
 
-                        else if ( (LA21_0=='k') ) {s = 14;}
+                        else if ( (LA21_0=='i') ) {s = 14;}
 
                         else if ( (LA21_0=='*') ) {s = 15;}
 
@@ -4143,13 +4208,13 @@ public class InternalMenuDslLexer extends Lexer {
 
                         else if ( (LA21_0=='?') ) {s = 36;}
 
-                        else if ( (LA21_0==':') ) {s = 37;}
+                        else if ( (LA21_0=='a') ) {s = 37;}
 
-                        else if ( (LA21_0=='f') ) {s = 38;}
+                        else if ( (LA21_0==':') ) {s = 38;}
 
-                        else if ( (LA21_0=='v') ) {s = 39;}
+                        else if ( (LA21_0=='f') ) {s = 39;}
 
-                        else if ( (LA21_0=='r') ) {s = 40;}
+                        else if ( (LA21_0=='v') ) {s = 40;}
 
                         else if ( (LA21_0=='0') ) {s = 41;}
 
diff --git a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslParser.java b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslParser.java
index 8897be9..0be97be 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslParser.java
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/parser/antlr/internal/InternalMenuDslParser.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'{'", "'expandedImage'", "'collapsedImage'", "'accordionSubmenu'", "'height'", "'width'", "'designer'", "'}'", "'entry'", "'describedBy'", "'image'", "'showBadge'", "'process'", "'perspective'", "'table'", "'dialog'", "'userFilter'", "'keyBinding'", "'import'", "'static'", "'extension'", "'*'", "'ns'", "';'", "'@'", "'('", "','", "')'", "'='", "'#'", "'['", "']'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'**'", "'/'", "'%'", "'!'", "'as'", "'++'", "'--'", "'.'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'var'", "'val'", "'extends'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'expandedImage'", "'collapsedImage'", "'height'", "'width'", "'designer'", "'category'", "'table'", "'dialog'", "'userFilter'", "'reportPrinter'", "'keyBinding'", "'systemSettings'", "'{'", "'}'", "'tree'", "'tooltip'", "'entry'", "'icon'", "'process'", "'perspective'", "'import'", "'static'", "'extension'", "'*'", "'ns'", "';'", "'@'", "'('", "','", "')'", "'='", "'#'", "'['", "']'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'**'", "'/'", "'%'", "'!'", "'as'", "'++'", "'--'", "'.'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'var'", "'val'", "'extends'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'"
     };
     public static final int RULE_HEX=6;
     public static final int T__50=50;
@@ -120,11 +120,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     public static final int RULE_ANY_OTHER=12;
     public static final int T__88=88;
     public static final int T__89=89;
+    public static final int T__107=107;
     public static final int T__84=84;
     public static final int T__104=104;
     public static final int T__85=85;
     public static final int T__103=103;
     public static final int T__86=86;
+    public static final int T__106=106;
     public static final int T__87=87;
     public static final int T__105=105;
 
@@ -208,30 +210,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMenuModel"
-    // InternalMenuDsl.g:71:1: ruleMenuModel returns [EObject current=null] : ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_packages_1_0= ruleMenuPackage ) )* ) ;
+    // InternalMenuDsl.g:71:1: ruleMenuModel returns [EObject current=null] : ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_menupackage_1_0= ruleMenuPackage ) ) ) ;
     public final EObject ruleMenuModel() throws RecognitionException {
         EObject current = null;
 
         EObject lv_importSection_0_0 = null;
 
-        EObject lv_packages_1_0 = null;
+        EObject lv_menupackage_1_0 = null;
 
 
 
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:77:2: ( ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_packages_1_0= ruleMenuPackage ) )* ) )
-            // InternalMenuDsl.g:78:2: ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_packages_1_0= ruleMenuPackage ) )* )
+            // InternalMenuDsl.g:77:2: ( ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_menupackage_1_0= ruleMenuPackage ) ) ) )
+            // InternalMenuDsl.g:78:2: ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_menupackage_1_0= ruleMenuPackage ) ) )
             {
-            // InternalMenuDsl.g:78:2: ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_packages_1_0= ruleMenuPackage ) )* )
-            // InternalMenuDsl.g:79:3: ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_packages_1_0= ruleMenuPackage ) )*
+            // InternalMenuDsl.g:78:2: ( ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_menupackage_1_0= ruleMenuPackage ) ) )
+            // InternalMenuDsl.g:79:3: ( (lv_importSection_0_0= ruleXImportSection ) )? ( (lv_menupackage_1_0= ruleMenuPackage ) )
             {
             // InternalMenuDsl.g:79:3: ( (lv_importSection_0_0= ruleXImportSection ) )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==32) ) {
+            if ( (LA1_0==34) ) {
                 alt1=1;
             }
             switch (alt1) {
@@ -273,58 +275,40 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:98:3: ( (lv_packages_1_0= ruleMenuPackage ) )*
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-
-                if ( (LA2_0==13) ) {
-                    alt2=1;
-                }
-
-
-                switch (alt2) {
-            	case 1 :
-            	    // InternalMenuDsl.g:99:4: (lv_packages_1_0= ruleMenuPackage )
-            	    {
-            	    // InternalMenuDsl.g:99:4: (lv_packages_1_0= ruleMenuPackage )
-            	    // InternalMenuDsl.g:100:5: lv_packages_1_0= ruleMenuPackage
-            	    {
-            	    if ( state.backtracking==0 ) {
-
-            	      					newCompositeNode(grammarAccess.getMenuModelAccess().getPackagesMenuPackageParserRuleCall_1_0());
-            	      				
-            	    }
-            	    pushFollow(FOLLOW_3);
-            	    lv_packages_1_0=ruleMenuPackage();
+            // InternalMenuDsl.g:98:3: ( (lv_menupackage_1_0= ruleMenuPackage ) )
+            // InternalMenuDsl.g:99:4: (lv_menupackage_1_0= ruleMenuPackage )
+            {
+            // InternalMenuDsl.g:99:4: (lv_menupackage_1_0= ruleMenuPackage )
+            // InternalMenuDsl.g:100:5: lv_menupackage_1_0= ruleMenuPackage
+            {
+            if ( state.backtracking==0 ) {
 
-            	    state._fsp--;
-            	    if (state.failed) return current;
-            	    if ( state.backtracking==0 ) {
+              					newCompositeNode(grammarAccess.getMenuModelAccess().getMenupackageMenuPackageParserRuleCall_1_0());
+              				
+            }
+            pushFollow(FOLLOW_2);
+            lv_menupackage_1_0=ruleMenuPackage();
 
-            	      					if (current==null) {
-            	      						current = createModelElementForParent(grammarAccess.getMenuModelRule());
-            	      					}
-            	      					add(
-            	      						current,
-            	      						"packages",
-            	      						lv_packages_1_0,
-            	      						"org.eclipse.osbp.xtext.menu.MenuDsl.MenuPackage");
-            	      					afterParserOrEnumRuleCall();
-            	      				
-            	    }
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
 
-            	    }
+              					if (current==null) {
+              						current = createModelElementForParent(grammarAccess.getMenuModelRule());
+              					}
+              					set(
+              						current,
+              						"menupackage",
+              						lv_menupackage_1_0,
+              						"org.eclipse.osbp.xtext.menu.MenuDsl.MenuPackage");
+              					afterParserOrEnumRuleCall();
+              				
+            }
 
+            }
 
-            	    }
-            	    break;
 
-            	default :
-            	    break loop2;
-                }
-            } while (true);
+            }
 
 
             }
@@ -391,37 +375,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMenuPackage"
-    // InternalMenuDsl.g:128:1: ruleMenuPackage returns [EObject current=null] : ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= '{' otherlv_4= 'expandedImage' ( (lv_expandedImage_5_0= RULE_STRING ) ) otherlv_6= 'collapsedImage' ( (lv_collapsedImage_7_0= RULE_STRING ) ) ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )? (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )? (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )? ( (lv_hasDesigner_13_0= 'designer' ) )? ( (lv_entries_14_0= ruleMenuEntry ) )* otherlv_15= '}' )? ) ;
+    // InternalMenuDsl.g:128:1: ruleMenuPackage returns [EObject current=null] : ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= 'expandedImage' ( (lv_expandedImage_4_0= RULE_STRING ) ) otherlv_5= 'collapsedImage' ( (lv_collapsedImage_6_0= RULE_STRING ) ) (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )? (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )? ( (lv_hasDesigner_11_0= 'designer' ) )? ( (lv_categories_12_0= ruleMenuCategory ) )* )? ) ;
     public final EObject ruleMenuPackage() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_1=null;
         Token otherlv_3=null;
-        Token otherlv_4=null;
-        Token lv_expandedImage_5_0=null;
-        Token otherlv_6=null;
-        Token lv_collapsedImage_7_0=null;
-        Token lv_subMenuIsAccordion_8_0=null;
+        Token lv_expandedImage_4_0=null;
+        Token otherlv_5=null;
+        Token lv_collapsedImage_6_0=null;
+        Token otherlv_7=null;
+        Token lv_height_8_0=null;
         Token otherlv_9=null;
-        Token lv_height_10_0=null;
-        Token otherlv_11=null;
-        Token lv_width_12_0=null;
-        Token lv_hasDesigner_13_0=null;
-        Token otherlv_15=null;
+        Token lv_width_10_0=null;
+        Token lv_hasDesigner_11_0=null;
         AntlrDatatypeRuleToken lv_name_2_0 = null;
 
-        EObject lv_entries_14_0 = null;
+        EObject lv_categories_12_0 = null;
 
 
 
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:134:2: ( ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= '{' otherlv_4= 'expandedImage' ( (lv_expandedImage_5_0= RULE_STRING ) ) otherlv_6= 'collapsedImage' ( (lv_collapsedImage_7_0= RULE_STRING ) ) ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )? (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )? (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )? ( (lv_hasDesigner_13_0= 'designer' ) )? ( (lv_entries_14_0= ruleMenuEntry ) )* otherlv_15= '}' )? ) )
-            // InternalMenuDsl.g:135:2: ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= '{' otherlv_4= 'expandedImage' ( (lv_expandedImage_5_0= RULE_STRING ) ) otherlv_6= 'collapsedImage' ( (lv_collapsedImage_7_0= RULE_STRING ) ) ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )? (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )? (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )? ( (lv_hasDesigner_13_0= 'designer' ) )? ( (lv_entries_14_0= ruleMenuEntry ) )* otherlv_15= '}' )? )
+            // InternalMenuDsl.g:134:2: ( ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= 'expandedImage' ( (lv_expandedImage_4_0= RULE_STRING ) ) otherlv_5= 'collapsedImage' ( (lv_collapsedImage_6_0= RULE_STRING ) ) (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )? (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )? ( (lv_hasDesigner_11_0= 'designer' ) )? ( (lv_categories_12_0= ruleMenuCategory ) )* )? ) )
+            // InternalMenuDsl.g:135:2: ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= 'expandedImage' ( (lv_expandedImage_4_0= RULE_STRING ) ) otherlv_5= 'collapsedImage' ( (lv_collapsedImage_6_0= RULE_STRING ) ) (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )? (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )? ( (lv_hasDesigner_11_0= 'designer' ) )? ( (lv_categories_12_0= ruleMenuCategory ) )* )? )
             {
-            // InternalMenuDsl.g:135:2: ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= '{' otherlv_4= 'expandedImage' ( (lv_expandedImage_5_0= RULE_STRING ) ) otherlv_6= 'collapsedImage' ( (lv_collapsedImage_7_0= RULE_STRING ) ) ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )? (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )? (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )? ( (lv_hasDesigner_13_0= 'designer' ) )? ( (lv_entries_14_0= ruleMenuEntry ) )* otherlv_15= '}' )? )
-            // InternalMenuDsl.g:136:3: () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= '{' otherlv_4= 'expandedImage' ( (lv_expandedImage_5_0= RULE_STRING ) ) otherlv_6= 'collapsedImage' ( (lv_collapsedImage_7_0= RULE_STRING ) ) ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )? (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )? (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )? ( (lv_hasDesigner_13_0= 'designer' ) )? ( (lv_entries_14_0= ruleMenuEntry ) )* otherlv_15= '}' )?
+            // InternalMenuDsl.g:135:2: ( () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= 'expandedImage' ( (lv_expandedImage_4_0= RULE_STRING ) ) otherlv_5= 'collapsedImage' ( (lv_collapsedImage_6_0= RULE_STRING ) ) (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )? (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )? ( (lv_hasDesigner_11_0= 'designer' ) )? ( (lv_categories_12_0= ruleMenuCategory ) )* )? )
+            // InternalMenuDsl.g:136:3: () otherlv_1= 'package' ( (lv_name_2_0= ruleQualifiedName ) ) (otherlv_3= 'expandedImage' ( (lv_expandedImage_4_0= RULE_STRING ) ) otherlv_5= 'collapsedImage' ( (lv_collapsedImage_6_0= RULE_STRING ) ) (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )? (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )? ( (lv_hasDesigner_11_0= 'designer' ) )? ( (lv_categories_12_0= ruleMenuCategory ) )* )?
             {
             // InternalMenuDsl.g:136:3: ()
             // InternalMenuDsl.g:137:4: 
@@ -477,39 +458,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:166:3: (otherlv_3= '{' otherlv_4= 'expandedImage' ( (lv_expandedImage_5_0= RULE_STRING ) ) otherlv_6= 'collapsedImage' ( (lv_collapsedImage_7_0= RULE_STRING ) ) ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )? (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )? (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )? ( (lv_hasDesigner_13_0= 'designer' ) )? ( (lv_entries_14_0= ruleMenuEntry ) )* otherlv_15= '}' )?
-            int alt8=2;
-            int LA8_0 = input.LA(1);
+            // InternalMenuDsl.g:166:3: (otherlv_3= 'expandedImage' ( (lv_expandedImage_4_0= RULE_STRING ) ) otherlv_5= 'collapsedImage' ( (lv_collapsedImage_6_0= RULE_STRING ) ) (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )? (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )? ( (lv_hasDesigner_11_0= 'designer' ) )? ( (lv_categories_12_0= ruleMenuCategory ) )* )?
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA8_0==14) ) {
-                alt8=1;
+            if ( (LA6_0==14) ) {
+                alt6=1;
             }
-            switch (alt8) {
+            switch (alt6) {
                 case 1 :
-                    // InternalMenuDsl.g:167:4: otherlv_3= '{' otherlv_4= 'expandedImage' ( (lv_expandedImage_5_0= RULE_STRING ) ) otherlv_6= 'collapsedImage' ( (lv_collapsedImage_7_0= RULE_STRING ) ) ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )? (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )? (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )? ( (lv_hasDesigner_13_0= 'designer' ) )? ( (lv_entries_14_0= ruleMenuEntry ) )* otherlv_15= '}'
+                    // InternalMenuDsl.g:167:4: otherlv_3= 'expandedImage' ( (lv_expandedImage_4_0= RULE_STRING ) ) otherlv_5= 'collapsedImage' ( (lv_collapsedImage_6_0= RULE_STRING ) ) (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )? (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )? ( (lv_hasDesigner_11_0= 'designer' ) )? ( (lv_categories_12_0= ruleMenuCategory ) )*
                     {
                     otherlv_3=(Token)match(input,14,FOLLOW_6); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      				newLeafNode(otherlv_3, grammarAccess.getMenuPackageAccess().getLeftCurlyBracketKeyword_3_0());
-                      			
-                    }
-                    otherlv_4=(Token)match(input,15,FOLLOW_7); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      				newLeafNode(otherlv_4, grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_1());
+                      				newLeafNode(otherlv_3, grammarAccess.getMenuPackageAccess().getExpandedImageKeyword_3_0());
                       			
                     }
-                    // InternalMenuDsl.g:175:4: ( (lv_expandedImage_5_0= RULE_STRING ) )
-                    // InternalMenuDsl.g:176:5: (lv_expandedImage_5_0= RULE_STRING )
+                    // InternalMenuDsl.g:171:4: ( (lv_expandedImage_4_0= RULE_STRING ) )
+                    // InternalMenuDsl.g:172:5: (lv_expandedImage_4_0= RULE_STRING )
                     {
-                    // InternalMenuDsl.g:176:5: (lv_expandedImage_5_0= RULE_STRING )
-                    // InternalMenuDsl.g:177:6: lv_expandedImage_5_0= RULE_STRING
+                    // InternalMenuDsl.g:172:5: (lv_expandedImage_4_0= RULE_STRING )
+                    // InternalMenuDsl.g:173:6: lv_expandedImage_4_0= RULE_STRING
                     {
-                    lv_expandedImage_5_0=(Token)match(input,RULE_STRING,FOLLOW_8); if (state.failed) return current;
+                    lv_expandedImage_4_0=(Token)match(input,RULE_STRING,FOLLOW_7); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						newLeafNode(lv_expandedImage_5_0, grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_2_0());
+                      						newLeafNode(lv_expandedImage_4_0, grammarAccess.getMenuPackageAccess().getExpandedImageSTRINGTerminalRuleCall_3_1_0());
                       					
                     }
                     if ( state.backtracking==0 ) {
@@ -520,7 +495,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       						setWithLastConsumed(
                       							current,
                       							"expandedImage",
-                      							lv_expandedImage_5_0,
+                      							lv_expandedImage_4_0,
                       							"org.eclipse.xtext.xbase.Xtype.STRING");
                       					
                     }
@@ -530,22 +505,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_6=(Token)match(input,16,FOLLOW_7); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,15,FOLLOW_6); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      				newLeafNode(otherlv_6, grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_3());
+                      				newLeafNode(otherlv_5, grammarAccess.getMenuPackageAccess().getCollapsedImageKeyword_3_2());
                       			
                     }
-                    // InternalMenuDsl.g:197:4: ( (lv_collapsedImage_7_0= RULE_STRING ) )
-                    // InternalMenuDsl.g:198:5: (lv_collapsedImage_7_0= RULE_STRING )
+                    // InternalMenuDsl.g:193:4: ( (lv_collapsedImage_6_0= RULE_STRING ) )
+                    // InternalMenuDsl.g:194:5: (lv_collapsedImage_6_0= RULE_STRING )
                     {
-                    // InternalMenuDsl.g:198:5: (lv_collapsedImage_7_0= RULE_STRING )
-                    // InternalMenuDsl.g:199:6: lv_collapsedImage_7_0= RULE_STRING
+                    // InternalMenuDsl.g:194:5: (lv_collapsedImage_6_0= RULE_STRING )
+                    // InternalMenuDsl.g:195:6: lv_collapsedImage_6_0= RULE_STRING
                     {
-                    lv_collapsedImage_7_0=(Token)match(input,RULE_STRING,FOLLOW_9); if (state.failed) return current;
+                    lv_collapsedImage_6_0=(Token)match(input,RULE_STRING,FOLLOW_8); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						newLeafNode(lv_collapsedImage_7_0, grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_4_0());
+                      						newLeafNode(lv_collapsedImage_6_0, grammarAccess.getMenuPackageAccess().getCollapsedImageSTRINGTerminalRuleCall_3_3_0());
                       					
                     }
                     if ( state.backtracking==0 ) {
@@ -556,7 +531,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       						setWithLastConsumed(
                       							current,
                       							"collapsedImage",
-                      							lv_collapsedImage_7_0,
+                      							lv_collapsedImage_6_0,
                       							"org.eclipse.xtext.xbase.Xtype.STRING");
                       					
                     }
@@ -566,70 +541,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:215:4: ( (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' ) )?
-                    int alt3=2;
-                    int LA3_0 = input.LA(1);
-
-                    if ( (LA3_0==17) ) {
-                        alt3=1;
-                    }
-                    switch (alt3) {
-                        case 1 :
-                            // InternalMenuDsl.g:216:5: (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' )
-                            {
-                            // InternalMenuDsl.g:216:5: (lv_subMenuIsAccordion_8_0= 'accordionSubmenu' )
-                            // InternalMenuDsl.g:217:6: lv_subMenuIsAccordion_8_0= 'accordionSubmenu'
-                            {
-                            lv_subMenuIsAccordion_8_0=(Token)match(input,17,FOLLOW_10); if (state.failed) return current;
-                            if ( state.backtracking==0 ) {
-
-                              						newLeafNode(lv_subMenuIsAccordion_8_0, grammarAccess.getMenuPackageAccess().getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0());
-                              					
-                            }
-                            if ( state.backtracking==0 ) {
-
-                              						if (current==null) {
-                              							current = createModelElement(grammarAccess.getMenuPackageRule());
-                              						}
-                              						setWithLastConsumed(current, "subMenuIsAccordion", true, "accordionSubmenu");
-                              					
-                            }
-
-                            }
-
-
-                            }
-                            break;
-
-                    }
-
-                    // InternalMenuDsl.g:229:4: (otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) ) )?
-                    int alt4=2;
-                    int LA4_0 = input.LA(1);
+                    // InternalMenuDsl.g:211:4: (otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) ) )?
+                    int alt2=2;
+                    int LA2_0 = input.LA(1);
 
-                    if ( (LA4_0==18) ) {
-                        alt4=1;
+                    if ( (LA2_0==16) ) {
+                        alt2=1;
                     }
-                    switch (alt4) {
+                    switch (alt2) {
                         case 1 :
-                            // InternalMenuDsl.g:230:5: otherlv_9= 'height' ( (lv_height_10_0= RULE_STRING ) )
+                            // InternalMenuDsl.g:212:5: otherlv_7= 'height' ( (lv_height_8_0= RULE_STRING ) )
                             {
-                            otherlv_9=(Token)match(input,18,FOLLOW_7); if (state.failed) return current;
+                            otherlv_7=(Token)match(input,16,FOLLOW_6); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
-                              					newLeafNode(otherlv_9, grammarAccess.getMenuPackageAccess().getHeightKeyword_3_6_0());
+                              					newLeafNode(otherlv_7, grammarAccess.getMenuPackageAccess().getHeightKeyword_3_4_0());
                               				
                             }
-                            // InternalMenuDsl.g:234:5: ( (lv_height_10_0= RULE_STRING ) )
-                            // InternalMenuDsl.g:235:6: (lv_height_10_0= RULE_STRING )
+                            // InternalMenuDsl.g:216:5: ( (lv_height_8_0= RULE_STRING ) )
+                            // InternalMenuDsl.g:217:6: (lv_height_8_0= RULE_STRING )
                             {
-                            // InternalMenuDsl.g:235:6: (lv_height_10_0= RULE_STRING )
-                            // InternalMenuDsl.g:236:7: lv_height_10_0= RULE_STRING
+                            // InternalMenuDsl.g:217:6: (lv_height_8_0= RULE_STRING )
+                            // InternalMenuDsl.g:218:7: lv_height_8_0= RULE_STRING
                             {
-                            lv_height_10_0=(Token)match(input,RULE_STRING,FOLLOW_11); if (state.failed) return current;
+                            lv_height_8_0=(Token)match(input,RULE_STRING,FOLLOW_9); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
-                              							newLeafNode(lv_height_10_0, grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_6_1_0());
+                              							newLeafNode(lv_height_8_0, grammarAccess.getMenuPackageAccess().getHeightSTRINGTerminalRuleCall_3_4_1_0());
                               						
                             }
                             if ( state.backtracking==0 ) {
@@ -640,7 +578,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                               							setWithLastConsumed(
                               								current,
                               								"height",
-                              								lv_height_10_0,
+                              								lv_height_8_0,
                               								"org.eclipse.xtext.xbase.Xtype.STRING");
                               						
                             }
@@ -656,33 +594,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:253:4: (otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) ) )?
-                    int alt5=2;
-                    int LA5_0 = input.LA(1);
+                    // InternalMenuDsl.g:235:4: (otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) ) )?
+                    int alt3=2;
+                    int LA3_0 = input.LA(1);
 
-                    if ( (LA5_0==19) ) {
-                        alt5=1;
+                    if ( (LA3_0==17) ) {
+                        alt3=1;
                     }
-                    switch (alt5) {
+                    switch (alt3) {
                         case 1 :
-                            // InternalMenuDsl.g:254:5: otherlv_11= 'width' ( (lv_width_12_0= RULE_STRING ) )
+                            // InternalMenuDsl.g:236:5: otherlv_9= 'width' ( (lv_width_10_0= RULE_STRING ) )
                             {
-                            otherlv_11=(Token)match(input,19,FOLLOW_7); if (state.failed) return current;
+                            otherlv_9=(Token)match(input,17,FOLLOW_6); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
-                              					newLeafNode(otherlv_11, grammarAccess.getMenuPackageAccess().getWidthKeyword_3_7_0());
+                              					newLeafNode(otherlv_9, grammarAccess.getMenuPackageAccess().getWidthKeyword_3_5_0());
                               				
                             }
-                            // InternalMenuDsl.g:258:5: ( (lv_width_12_0= RULE_STRING ) )
-                            // InternalMenuDsl.g:259:6: (lv_width_12_0= RULE_STRING )
+                            // InternalMenuDsl.g:240:5: ( (lv_width_10_0= RULE_STRING ) )
+                            // InternalMenuDsl.g:241:6: (lv_width_10_0= RULE_STRING )
                             {
-                            // InternalMenuDsl.g:259:6: (lv_width_12_0= RULE_STRING )
-                            // InternalMenuDsl.g:260:7: lv_width_12_0= RULE_STRING
+                            // InternalMenuDsl.g:241:6: (lv_width_10_0= RULE_STRING )
+                            // InternalMenuDsl.g:242:7: lv_width_10_0= RULE_STRING
                             {
-                            lv_width_12_0=(Token)match(input,RULE_STRING,FOLLOW_12); if (state.failed) return current;
+                            lv_width_10_0=(Token)match(input,RULE_STRING,FOLLOW_10); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
-                              							newLeafNode(lv_width_12_0, grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_7_1_0());
+                              							newLeafNode(lv_width_10_0, grammarAccess.getMenuPackageAccess().getWidthSTRINGTerminalRuleCall_3_5_1_0());
                               						
                             }
                             if ( state.backtracking==0 ) {
@@ -693,7 +631,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                               							setWithLastConsumed(
                               								current,
                               								"width",
-                              								lv_width_12_0,
+                              								lv_width_10_0,
                               								"org.eclipse.xtext.xbase.Xtype.STRING");
                               						
                             }
@@ -709,24 +647,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:277:4: ( (lv_hasDesigner_13_0= 'designer' ) )?
-                    int alt6=2;
-                    int LA6_0 = input.LA(1);
+                    // InternalMenuDsl.g:259:4: ( (lv_hasDesigner_11_0= 'designer' ) )?
+                    int alt4=2;
+                    int LA4_0 = input.LA(1);
 
-                    if ( (LA6_0==20) ) {
-                        alt6=1;
+                    if ( (LA4_0==18) ) {
+                        alt4=1;
                     }
-                    switch (alt6) {
+                    switch (alt4) {
                         case 1 :
-                            // InternalMenuDsl.g:278:5: (lv_hasDesigner_13_0= 'designer' )
+                            // InternalMenuDsl.g:260:5: (lv_hasDesigner_11_0= 'designer' )
                             {
-                            // InternalMenuDsl.g:278:5: (lv_hasDesigner_13_0= 'designer' )
-                            // InternalMenuDsl.g:279:6: lv_hasDesigner_13_0= 'designer'
+                            // InternalMenuDsl.g:260:5: (lv_hasDesigner_11_0= 'designer' )
+                            // InternalMenuDsl.g:261:6: lv_hasDesigner_11_0= 'designer'
                             {
-                            lv_hasDesigner_13_0=(Token)match(input,20,FOLLOW_13); if (state.failed) return current;
+                            lv_hasDesigner_11_0=(Token)match(input,18,FOLLOW_11); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
-                              						newLeafNode(lv_hasDesigner_13_0, grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_8_0());
+                              						newLeafNode(lv_hasDesigner_11_0, grammarAccess.getMenuPackageAccess().getHasDesignerDesignerKeyword_3_6_0());
                               					
                             }
                             if ( state.backtracking==0 ) {
@@ -746,31 +684,31 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:291:4: ( (lv_entries_14_0= ruleMenuEntry ) )*
-                    loop7:
+                    // InternalMenuDsl.g:273:4: ( (lv_categories_12_0= ruleMenuCategory ) )*
+                    loop5:
                     do {
-                        int alt7=2;
-                        int LA7_0 = input.LA(1);
+                        int alt5=2;
+                        int LA5_0 = input.LA(1);
 
-                        if ( (LA7_0==22) ) {
-                            alt7=1;
+                        if ( (LA5_0==19) ) {
+                            alt5=1;
                         }
 
 
-                        switch (alt7) {
+                        switch (alt5) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:292:5: (lv_entries_14_0= ruleMenuEntry )
+                    	    // InternalMenuDsl.g:274:5: (lv_categories_12_0= ruleMenuCategory )
                     	    {
-                    	    // InternalMenuDsl.g:292:5: (lv_entries_14_0= ruleMenuEntry )
-                    	    // InternalMenuDsl.g:293:6: lv_entries_14_0= ruleMenuEntry
+                    	    // InternalMenuDsl.g:274:5: (lv_categories_12_0= ruleMenuCategory )
+                    	    // InternalMenuDsl.g:275:6: lv_categories_12_0= ruleMenuCategory
                     	    {
                     	    if ( state.backtracking==0 ) {
 
-                    	      						newCompositeNode(grammarAccess.getMenuPackageAccess().getEntriesMenuEntryParserRuleCall_3_9_0());
+                    	      						newCompositeNode(grammarAccess.getMenuPackageAccess().getCategoriesMenuCategoryParserRuleCall_3_7_0());
                     	      					
                     	    }
-                    	    pushFollow(FOLLOW_13);
-                    	    lv_entries_14_0=ruleMenuEntry();
+                    	    pushFollow(FOLLOW_11);
+                    	    lv_categories_12_0=ruleMenuCategory();
 
                     	    state._fsp--;
                     	    if (state.failed) return current;
@@ -781,9 +719,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	      						}
                     	      						add(
                     	      							current,
-                    	      							"entries",
-                    	      							lv_entries_14_0,
-                    	      							"org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
+                    	      							"categories",
+                    	      							lv_categories_12_0,
+                    	      							"org.eclipse.osbp.xtext.menu.MenuDsl.MenuCategory");
                     	      						afterParserOrEnumRuleCall();
                     	      					
                     	    }
@@ -795,16 +733,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop7;
+                    	    break loop5;
                         }
                     } while (true);
 
-                    otherlv_15=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      				newLeafNode(otherlv_15, grammarAccess.getMenuPackageAccess().getRightCurlyBracketKeyword_3_10());
-                      			
-                    }
 
                     }
                     break;
@@ -835,28 +767,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleMenuPackage"
 
 
-    // $ANTLR start "entryRuleMenuEntry"
-    // InternalMenuDsl.g:319:1: entryRuleMenuEntry returns [EObject current=null] : iv_ruleMenuEntry= ruleMenuEntry EOF ;
-    public final EObject entryRuleMenuEntry() throws RecognitionException {
+    // $ANTLR start "entryRuleMenuCategory"
+    // InternalMenuDsl.g:297:1: entryRuleMenuCategory returns [EObject current=null] : iv_ruleMenuCategory= ruleMenuCategory EOF ;
+    public final EObject entryRuleMenuCategory() throws RecognitionException {
         EObject current = null;
 
-        EObject iv_ruleMenuEntry = null;
+        EObject iv_ruleMenuCategory = null;
 
 
         try {
-            // InternalMenuDsl.g:319:50: (iv_ruleMenuEntry= ruleMenuEntry EOF )
-            // InternalMenuDsl.g:320:2: iv_ruleMenuEntry= ruleMenuEntry EOF
+            // InternalMenuDsl.g:297:53: (iv_ruleMenuCategory= ruleMenuCategory EOF )
+            // InternalMenuDsl.g:298:2: iv_ruleMenuCategory= ruleMenuCategory EOF
             {
             if ( state.backtracking==0 ) {
-               newCompositeNode(grammarAccess.getMenuEntryRule()); 
+               newCompositeNode(grammarAccess.getMenuCategoryRule()); 
             }
             pushFollow(FOLLOW_1);
-            iv_ruleMenuEntry=ruleMenuEntry();
+            iv_ruleMenuCategory=ruleMenuCategory();
 
             state._fsp--;
             if (state.failed) return current;
             if ( state.backtracking==0 ) {
-               current =iv_ruleMenuEntry; 
+               current =iv_ruleMenuCategory; 
             }
             match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
@@ -872,92 +804,71 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "entryRuleMenuEntry"
+    // $ANTLR end "entryRuleMenuCategory"
 
 
-    // $ANTLR start "ruleMenuEntry"
-    // InternalMenuDsl.g:326:1: ruleMenuEntry returns [EObject current=null] : ( () otherlv_1= 'entry' ( (lv_entryid_2_0= ruleTRANSLATABLEID ) ) ( ( (lv_description_3_0= 'describedBy' ) ) ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) ) )? ( ( (lv_hasImage_5_0= 'image' ) ) ( (lv_image_6_0= RULE_STRING ) ) )? ( (lv_showBadge_7_0= 'showBadge' ) )? ( ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) ) | ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) ) | ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) ) | ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) ) | ( (lv_hasUserFilter_16_0= 'userFilter' ) ) | ( (lv_hasKeyBinding_17_0= 'keyBinding' ) ) )? (otherlv_18= '{' ( (lv_subentries_19_0= ruleMenuEntry ) )* otherlv_20= '}' )? ) ;
-    public final EObject ruleMenuEntry() throws RecognitionException {
+    // $ANTLR start "ruleMenuCategory"
+    // InternalMenuDsl.g:304:1: ruleMenuCategory returns [EObject current=null] : (otherlv_0= 'category' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) ) | ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( (lv_hasUserFilter_6_0= 'userFilter' ) ) | ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) ) | ( (lv_hasKeyBinding_8_0= 'keyBinding' ) ) | ( (lv_hasSystemSettings_9_0= 'systemSettings' ) ) | (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' ) )? ) ;
+    public final EObject ruleMenuCategory() throws RecognitionException {
         EObject current = null;
 
-        Token otherlv_1=null;
-        Token lv_description_3_0=null;
-        Token lv_hasImage_5_0=null;
-        Token lv_image_6_0=null;
-        Token lv_showBadge_7_0=null;
-        Token lv_hasProcess_8_0=null;
-        Token otherlv_9=null;
-        Token lv_hasPerspective_10_0=null;
-        Token otherlv_11=null;
-        Token lv_hasTable_12_0=null;
-        Token otherlv_13=null;
-        Token lv_hasDialog_14_0=null;
-        Token otherlv_15=null;
-        Token lv_hasUserFilter_16_0=null;
-        Token lv_hasKeyBinding_17_0=null;
-        Token otherlv_18=null;
-        Token otherlv_20=null;
-        AntlrDatatypeRuleToken lv_entryid_2_0 = null;
-
-        AntlrDatatypeRuleToken lv_descriptionValue_4_0 = null;
+        Token otherlv_0=null;
+        Token lv_hasTable_2_0=null;
+        Token otherlv_3=null;
+        Token lv_hasDialog_4_0=null;
+        Token otherlv_5=null;
+        Token lv_hasUserFilter_6_0=null;
+        Token lv_hasReportPrinter_7_0=null;
+        Token lv_hasKeyBinding_8_0=null;
+        Token lv_hasSystemSettings_9_0=null;
+        Token otherlv_10=null;
+        Token otherlv_12=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
 
-        EObject lv_subentries_19_0 = null;
+        EObject lv_trees_11_0 = null;
 
 
 
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:332:2: ( ( () otherlv_1= 'entry' ( (lv_entryid_2_0= ruleTRANSLATABLEID ) ) ( ( (lv_description_3_0= 'describedBy' ) ) ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) ) )? ( ( (lv_hasImage_5_0= 'image' ) ) ( (lv_image_6_0= RULE_STRING ) ) )? ( (lv_showBadge_7_0= 'showBadge' ) )? ( ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) ) | ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) ) | ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) ) | ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) ) | ( (lv_hasUserFilter_16_0= 'userFilter' ) ) | ( (lv_hasKeyBinding_17_0= 'keyBinding' ) ) )? (otherlv_18= '{' ( (lv_subentries_19_0= ruleMenuEntry ) )* otherlv_20= '}' )? ) )
-            // InternalMenuDsl.g:333:2: ( () otherlv_1= 'entry' ( (lv_entryid_2_0= ruleTRANSLATABLEID ) ) ( ( (lv_description_3_0= 'describedBy' ) ) ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) ) )? ( ( (lv_hasImage_5_0= 'image' ) ) ( (lv_image_6_0= RULE_STRING ) ) )? ( (lv_showBadge_7_0= 'showBadge' ) )? ( ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) ) | ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) ) | ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) ) | ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) ) | ( (lv_hasUserFilter_16_0= 'userFilter' ) ) | ( (lv_hasKeyBinding_17_0= 'keyBinding' ) ) )? (otherlv_18= '{' ( (lv_subentries_19_0= ruleMenuEntry ) )* otherlv_20= '}' )? )
-            {
-            // InternalMenuDsl.g:333:2: ( () otherlv_1= 'entry' ( (lv_entryid_2_0= ruleTRANSLATABLEID ) ) ( ( (lv_description_3_0= 'describedBy' ) ) ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) ) )? ( ( (lv_hasImage_5_0= 'image' ) ) ( (lv_image_6_0= RULE_STRING ) ) )? ( (lv_showBadge_7_0= 'showBadge' ) )? ( ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) ) | ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) ) | ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) ) | ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) ) | ( (lv_hasUserFilter_16_0= 'userFilter' ) ) | ( (lv_hasKeyBinding_17_0= 'keyBinding' ) ) )? (otherlv_18= '{' ( (lv_subentries_19_0= ruleMenuEntry ) )* otherlv_20= '}' )? )
-            // InternalMenuDsl.g:334:3: () otherlv_1= 'entry' ( (lv_entryid_2_0= ruleTRANSLATABLEID ) ) ( ( (lv_description_3_0= 'describedBy' ) ) ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) ) )? ( ( (lv_hasImage_5_0= 'image' ) ) ( (lv_image_6_0= RULE_STRING ) ) )? ( (lv_showBadge_7_0= 'showBadge' ) )? ( ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) ) | ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) ) | ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) ) | ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) ) | ( (lv_hasUserFilter_16_0= 'userFilter' ) ) | ( (lv_hasKeyBinding_17_0= 'keyBinding' ) ) )? (otherlv_18= '{' ( (lv_subentries_19_0= ruleMenuEntry ) )* otherlv_20= '}' )?
+            // InternalMenuDsl.g:310:2: ( (otherlv_0= 'category' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) ) | ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( (lv_hasUserFilter_6_0= 'userFilter' ) ) | ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) ) | ( (lv_hasKeyBinding_8_0= 'keyBinding' ) ) | ( (lv_hasSystemSettings_9_0= 'systemSettings' ) ) | (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' ) )? ) )
+            // InternalMenuDsl.g:311:2: (otherlv_0= 'category' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) ) | ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( (lv_hasUserFilter_6_0= 'userFilter' ) ) | ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) ) | ( (lv_hasKeyBinding_8_0= 'keyBinding' ) ) | ( (lv_hasSystemSettings_9_0= 'systemSettings' ) ) | (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' ) )? )
             {
-            // InternalMenuDsl.g:334:3: ()
-            // InternalMenuDsl.g:335:4: 
+            // InternalMenuDsl.g:311:2: (otherlv_0= 'category' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) ) | ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( (lv_hasUserFilter_6_0= 'userFilter' ) ) | ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) ) | ( (lv_hasKeyBinding_8_0= 'keyBinding' ) ) | ( (lv_hasSystemSettings_9_0= 'systemSettings' ) ) | (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' ) )? )
+            // InternalMenuDsl.g:312:3: otherlv_0= 'category' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) ) | ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( (lv_hasUserFilter_6_0= 'userFilter' ) ) | ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) ) | ( (lv_hasKeyBinding_8_0= 'keyBinding' ) ) | ( (lv_hasSystemSettings_9_0= 'systemSettings' ) ) | (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' ) )?
             {
+            otherlv_0=(Token)match(input,19,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
-              				current = forceCreateModelElement(
-              					grammarAccess.getMenuEntryAccess().getMenuEntryAction_0(),
-              					current);
-              			
-            }
-
-            }
-
-            otherlv_1=(Token)match(input,22,FOLLOW_4); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-
-              			newLeafNode(otherlv_1, grammarAccess.getMenuEntryAccess().getEntryKeyword_1());
+              			newLeafNode(otherlv_0, grammarAccess.getMenuCategoryAccess().getCategoryKeyword_0());
               		
             }
-            // InternalMenuDsl.g:345:3: ( (lv_entryid_2_0= ruleTRANSLATABLEID ) )
-            // InternalMenuDsl.g:346:4: (lv_entryid_2_0= ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:316:3: ( (lv_name_1_0= ruleTRANSLATABLEID ) )
+            // InternalMenuDsl.g:317:4: (lv_name_1_0= ruleTRANSLATABLEID )
             {
-            // InternalMenuDsl.g:346:4: (lv_entryid_2_0= ruleTRANSLATABLEID )
-            // InternalMenuDsl.g:347:5: lv_entryid_2_0= ruleTRANSLATABLEID
+            // InternalMenuDsl.g:317:4: (lv_name_1_0= ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:318:5: lv_name_1_0= ruleTRANSLATABLEID
             {
             if ( state.backtracking==0 ) {
 
-              					newCompositeNode(grammarAccess.getMenuEntryAccess().getEntryidTRANSLATABLEIDParserRuleCall_2_0());
+              					newCompositeNode(grammarAccess.getMenuCategoryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0());
               				
             }
-            pushFollow(FOLLOW_14);
-            lv_entryid_2_0=ruleTRANSLATABLEID();
+            pushFollow(FOLLOW_12);
+            lv_name_1_0=ruleTRANSLATABLEID();
 
             state._fsp--;
             if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					if (current==null) {
-              						current = createModelElementForParent(grammarAccess.getMenuEntryRule());
+              						current = createModelElementForParent(grammarAccess.getMenuCategoryRule());
               					}
               					set(
               						current,
-              						"entryid",
-              						lv_entryid_2_0,
+              						"name",
+              						lv_name_1_0,
               						"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLEID");
               					afterParserOrEnumRuleCall();
               				
@@ -968,36 +879,72 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:364:3: ( ( (lv_description_3_0= 'describedBy' ) ) ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) ) )?
-            int alt9=2;
-            int LA9_0 = input.LA(1);
-
-            if ( (LA9_0==23) ) {
-                alt9=1;
+            // InternalMenuDsl.g:335:3: ( ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) ) | ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( (lv_hasUserFilter_6_0= 'userFilter' ) ) | ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) ) | ( (lv_hasKeyBinding_8_0= 'keyBinding' ) ) | ( (lv_hasSystemSettings_9_0= 'systemSettings' ) ) | (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' ) )?
+            int alt8=8;
+            switch ( input.LA(1) ) {
+                case 20:
+                    {
+                    alt8=1;
+                    }
+                    break;
+                case 21:
+                    {
+                    alt8=2;
+                    }
+                    break;
+                case 22:
+                    {
+                    alt8=3;
+                    }
+                    break;
+                case 23:
+                    {
+                    alt8=4;
+                    }
+                    break;
+                case 24:
+                    {
+                    alt8=5;
+                    }
+                    break;
+                case 25:
+                    {
+                    alt8=6;
+                    }
+                    break;
+                case 26:
+                    {
+                    alt8=7;
+                    }
+                    break;
             }
-            switch (alt9) {
+
+            switch (alt8) {
                 case 1 :
-                    // InternalMenuDsl.g:365:4: ( (lv_description_3_0= 'describedBy' ) ) ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) )
+                    // InternalMenuDsl.g:336:4: ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) )
+                    {
+                    // InternalMenuDsl.g:336:4: ( ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) ) )
+                    // InternalMenuDsl.g:337:5: ( (lv_hasTable_2_0= 'table' ) ) ( (otherlv_3= RULE_ID ) )
                     {
-                    // InternalMenuDsl.g:365:4: ( (lv_description_3_0= 'describedBy' ) )
-                    // InternalMenuDsl.g:366:5: (lv_description_3_0= 'describedBy' )
+                    // InternalMenuDsl.g:337:5: ( (lv_hasTable_2_0= 'table' ) )
+                    // InternalMenuDsl.g:338:6: (lv_hasTable_2_0= 'table' )
                     {
-                    // InternalMenuDsl.g:366:5: (lv_description_3_0= 'describedBy' )
-                    // InternalMenuDsl.g:367:6: lv_description_3_0= 'describedBy'
+                    // InternalMenuDsl.g:338:6: (lv_hasTable_2_0= 'table' )
+                    // InternalMenuDsl.g:339:7: lv_hasTable_2_0= 'table'
                     {
-                    lv_description_3_0=(Token)match(input,23,FOLLOW_7); if (state.failed) return current;
+                    lv_hasTable_2_0=(Token)match(input,20,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						newLeafNode(lv_description_3_0, grammarAccess.getMenuEntryAccess().getDescriptionDescribedByKeyword_3_0_0());
-                      					
+                      							newLeafNode(lv_hasTable_2_0, grammarAccess.getMenuCategoryAccess().getHasTableTableKeyword_2_0_0_0());
+                      						
                     }
                     if ( state.backtracking==0 ) {
 
-                      						if (current==null) {
-                      							current = createModelElement(grammarAccess.getMenuEntryRule());
-                      						}
-                      						setWithLastConsumed(current, "description", true, "describedBy");
-                      					
+                      							if (current==null) {
+                      								current = createModelElement(grammarAccess.getMenuCategoryRule());
+                      							}
+                      							setWithLastConsumed(current, "hasTable", true, "table");
+                      						
                     }
 
                     }
@@ -1005,34 +952,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:379:4: ( (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING ) )
-                    // InternalMenuDsl.g:380:5: (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING )
+                    // InternalMenuDsl.g:351:5: ( (otherlv_3= RULE_ID ) )
+                    // InternalMenuDsl.g:352:6: (otherlv_3= RULE_ID )
                     {
-                    // InternalMenuDsl.g:380:5: (lv_descriptionValue_4_0= ruleTRANSLATABLESTRING )
-                    // InternalMenuDsl.g:381:6: lv_descriptionValue_4_0= ruleTRANSLATABLESTRING
+                    // InternalMenuDsl.g:352:6: (otherlv_3= RULE_ID )
+                    // InternalMenuDsl.g:353:7: otherlv_3= RULE_ID
                     {
                     if ( state.backtracking==0 ) {
 
-                      						newCompositeNode(grammarAccess.getMenuEntryAccess().getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0());
-                      					
+                      							if (current==null) {
+                      								current = createModelElement(grammarAccess.getMenuCategoryRule());
+                      							}
+                      						
                     }
-                    pushFollow(FOLLOW_15);
-                    lv_descriptionValue_4_0=ruleTRANSLATABLESTRING();
-
-                    state._fsp--;
-                    if (state.failed) return current;
+                    otherlv_3=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						if (current==null) {
-                      							current = createModelElementForParent(grammarAccess.getMenuEntryRule());
-                      						}
-                      						set(
-                      							current,
-                      							"descriptionValue",
-                      							lv_descriptionValue_4_0,
-                      							"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLESTRING");
-                      						afterParserOrEnumRuleCall();
-                      					
+                      							newLeafNode(otherlv_3, grammarAccess.getMenuCategoryAccess().getTableTableCrossReference_2_0_1_0());
+                      						
                     }
 
                     }
@@ -1042,40 +979,60 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
                     }
+
+
+                    }
                     break;
+                case 2 :
+                    // InternalMenuDsl.g:366:4: ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) )
+                    {
+                    // InternalMenuDsl.g:366:4: ( ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) ) )
+                    // InternalMenuDsl.g:367:5: ( (lv_hasDialog_4_0= 'dialog' ) ) ( (otherlv_5= RULE_ID ) )
+                    {
+                    // InternalMenuDsl.g:367:5: ( (lv_hasDialog_4_0= 'dialog' ) )
+                    // InternalMenuDsl.g:368:6: (lv_hasDialog_4_0= 'dialog' )
+                    {
+                    // InternalMenuDsl.g:368:6: (lv_hasDialog_4_0= 'dialog' )
+                    // InternalMenuDsl.g:369:7: lv_hasDialog_4_0= 'dialog'
+                    {
+                    lv_hasDialog_4_0=(Token)match(input,21,FOLLOW_4); if (state.failed) return current;
+                    if ( state.backtracking==0 ) {
 
-            }
+                      							newLeafNode(lv_hasDialog_4_0, grammarAccess.getMenuCategoryAccess().getHasDialogDialogKeyword_2_1_0_0());
+                      						
+                    }
+                    if ( state.backtracking==0 ) {
 
-            // InternalMenuDsl.g:399:3: ( ( (lv_hasImage_5_0= 'image' ) ) ( (lv_image_6_0= RULE_STRING ) ) )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+                      							if (current==null) {
+                      								current = createModelElement(grammarAccess.getMenuCategoryRule());
+                      							}
+                      							setWithLastConsumed(current, "hasDialog", true, "dialog");
+                      						
+                    }
 
-            if ( (LA10_0==24) ) {
-                alt10=1;
-            }
-            switch (alt10) {
-                case 1 :
-                    // InternalMenuDsl.g:400:4: ( (lv_hasImage_5_0= 'image' ) ) ( (lv_image_6_0= RULE_STRING ) )
-                    {
-                    // InternalMenuDsl.g:400:4: ( (lv_hasImage_5_0= 'image' ) )
-                    // InternalMenuDsl.g:401:5: (lv_hasImage_5_0= 'image' )
+                    }
+
+
+                    }
+
+                    // InternalMenuDsl.g:381:5: ( (otherlv_5= RULE_ID ) )
+                    // InternalMenuDsl.g:382:6: (otherlv_5= RULE_ID )
                     {
-                    // InternalMenuDsl.g:401:5: (lv_hasImage_5_0= 'image' )
-                    // InternalMenuDsl.g:402:6: lv_hasImage_5_0= 'image'
+                    // InternalMenuDsl.g:382:6: (otherlv_5= RULE_ID )
+                    // InternalMenuDsl.g:383:7: otherlv_5= RULE_ID
                     {
-                    lv_hasImage_5_0=(Token)match(input,24,FOLLOW_7); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						newLeafNode(lv_hasImage_5_0, grammarAccess.getMenuEntryAccess().getHasImageImageKeyword_4_0_0());
-                      					
+                      							if (current==null) {
+                      								current = createModelElement(grammarAccess.getMenuCategoryRule());
+                      							}
+                      						
                     }
+                    otherlv_5=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						if (current==null) {
-                      							current = createModelElement(grammarAccess.getMenuEntryRule());
-                      						}
-                      						setWithLastConsumed(current, "hasImage", true, "image");
-                      					
+                      							newLeafNode(otherlv_5, grammarAccess.getMenuCategoryAccess().getDialogDialogCrossReference_2_1_1_0());
+                      						
                     }
 
                     }
@@ -1083,28 +1040,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:414:4: ( (lv_image_6_0= RULE_STRING ) )
-                    // InternalMenuDsl.g:415:5: (lv_image_6_0= RULE_STRING )
+
+                    }
+
+
+                    }
+                    break;
+                case 3 :
+                    // InternalMenuDsl.g:396:4: ( (lv_hasUserFilter_6_0= 'userFilter' ) )
                     {
-                    // InternalMenuDsl.g:415:5: (lv_image_6_0= RULE_STRING )
-                    // InternalMenuDsl.g:416:6: lv_image_6_0= RULE_STRING
+                    // InternalMenuDsl.g:396:4: ( (lv_hasUserFilter_6_0= 'userFilter' ) )
+                    // InternalMenuDsl.g:397:5: (lv_hasUserFilter_6_0= 'userFilter' )
                     {
-                    lv_image_6_0=(Token)match(input,RULE_STRING,FOLLOW_16); if (state.failed) return current;
+                    // InternalMenuDsl.g:397:5: (lv_hasUserFilter_6_0= 'userFilter' )
+                    // InternalMenuDsl.g:398:6: lv_hasUserFilter_6_0= 'userFilter'
+                    {
+                    lv_hasUserFilter_6_0=(Token)match(input,22,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						newLeafNode(lv_image_6_0, grammarAccess.getMenuEntryAccess().getImageSTRINGTerminalRuleCall_4_1_0());
+                      						newLeafNode(lv_hasUserFilter_6_0, grammarAccess.getMenuCategoryAccess().getHasUserFilterUserFilterKeyword_2_2_0());
                       					
                     }
                     if ( state.backtracking==0 ) {
 
                       						if (current==null) {
-                      							current = createModelElement(grammarAccess.getMenuEntryRule());
+                      							current = createModelElement(grammarAccess.getMenuCategoryRule());
                       						}
-                      						setWithLastConsumed(
-                      							current,
-                      							"image",
-                      							lv_image_6_0,
-                      							"org.eclipse.xtext.xbase.Xtype.STRING");
+                      						setWithLastConsumed(current, "hasUserFilter", true, "userFilter");
                       					
                     }
 
@@ -1116,107 +1078,92 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
                     break;
-
-            }
-
-            // InternalMenuDsl.g:433:3: ( (lv_showBadge_7_0= 'showBadge' ) )?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
-
-            if ( (LA11_0==25) ) {
-                alt11=1;
-            }
-            switch (alt11) {
-                case 1 :
-                    // InternalMenuDsl.g:434:4: (lv_showBadge_7_0= 'showBadge' )
+                case 4 :
+                    // InternalMenuDsl.g:411:4: ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) )
                     {
-                    // InternalMenuDsl.g:434:4: (lv_showBadge_7_0= 'showBadge' )
-                    // InternalMenuDsl.g:435:5: lv_showBadge_7_0= 'showBadge'
+                    // InternalMenuDsl.g:411:4: ( (lv_hasReportPrinter_7_0= 'reportPrinter' ) )
+                    // InternalMenuDsl.g:412:5: (lv_hasReportPrinter_7_0= 'reportPrinter' )
                     {
-                    lv_showBadge_7_0=(Token)match(input,25,FOLLOW_17); if (state.failed) return current;
+                    // InternalMenuDsl.g:412:5: (lv_hasReportPrinter_7_0= 'reportPrinter' )
+                    // InternalMenuDsl.g:413:6: lv_hasReportPrinter_7_0= 'reportPrinter'
+                    {
+                    lv_hasReportPrinter_7_0=(Token)match(input,23,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      					newLeafNode(lv_showBadge_7_0, grammarAccess.getMenuEntryAccess().getShowBadgeShowBadgeKeyword_5_0());
-                      				
+                      						newLeafNode(lv_hasReportPrinter_7_0, grammarAccess.getMenuCategoryAccess().getHasReportPrinterReportPrinterKeyword_2_3_0());
+                      					
                     }
                     if ( state.backtracking==0 ) {
 
-                      					if (current==null) {
-                      						current = createModelElement(grammarAccess.getMenuEntryRule());
-                      					}
-                      					setWithLastConsumed(current, "showBadge", true, "showBadge");
-                      				
+                      						if (current==null) {
+                      							current = createModelElement(grammarAccess.getMenuCategoryRule());
+                      						}
+                      						setWithLastConsumed(current, "hasReportPrinter", true, "reportPrinter");
+                      					
                     }
 
                     }
 
 
                     }
-                    break;
 
-            }
 
-            // InternalMenuDsl.g:447:3: ( ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) ) | ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) ) | ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) ) | ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) ) | ( (lv_hasUserFilter_16_0= 'userFilter' ) ) | ( (lv_hasKeyBinding_17_0= 'keyBinding' ) ) )?
-            int alt12=7;
-            switch ( input.LA(1) ) {
-                case 26:
-                    {
-                    alt12=1;
                     }
                     break;
-                case 27:
+                case 5 :
+                    // InternalMenuDsl.g:426:4: ( (lv_hasKeyBinding_8_0= 'keyBinding' ) )
                     {
-                    alt12=2;
-                    }
-                    break;
-                case 28:
+                    // InternalMenuDsl.g:426:4: ( (lv_hasKeyBinding_8_0= 'keyBinding' ) )
+                    // InternalMenuDsl.g:427:5: (lv_hasKeyBinding_8_0= 'keyBinding' )
                     {
-                    alt12=3;
-                    }
-                    break;
-                case 29:
+                    // InternalMenuDsl.g:427:5: (lv_hasKeyBinding_8_0= 'keyBinding' )
+                    // InternalMenuDsl.g:428:6: lv_hasKeyBinding_8_0= 'keyBinding'
                     {
-                    alt12=4;
+                    lv_hasKeyBinding_8_0=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
+                    if ( state.backtracking==0 ) {
+
+                      						newLeafNode(lv_hasKeyBinding_8_0, grammarAccess.getMenuCategoryAccess().getHasKeyBindingKeyBindingKeyword_2_4_0());
+                      					
                     }
-                    break;
-                case 30:
-                    {
-                    alt12=5;
+                    if ( state.backtracking==0 ) {
+
+                      						if (current==null) {
+                      							current = createModelElement(grammarAccess.getMenuCategoryRule());
+                      						}
+                      						setWithLastConsumed(current, "hasKeyBinding", true, "keyBinding");
+                      					
                     }
-                    break;
-                case 31:
-                    {
-                    alt12=6;
+
                     }
-                    break;
-            }
 
-            switch (alt12) {
-                case 1 :
-                    // InternalMenuDsl.g:448:4: ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) )
-                    {
-                    // InternalMenuDsl.g:448:4: ( ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) ) )
-                    // InternalMenuDsl.g:449:5: ( (lv_hasProcess_8_0= 'process' ) ) ( (otherlv_9= RULE_ID ) )
+
+                    }
+
+
+                    }
+                    break;
+                case 6 :
+                    // InternalMenuDsl.g:441:4: ( (lv_hasSystemSettings_9_0= 'systemSettings' ) )
                     {
-                    // InternalMenuDsl.g:449:5: ( (lv_hasProcess_8_0= 'process' ) )
-                    // InternalMenuDsl.g:450:6: (lv_hasProcess_8_0= 'process' )
+                    // InternalMenuDsl.g:441:4: ( (lv_hasSystemSettings_9_0= 'systemSettings' ) )
+                    // InternalMenuDsl.g:442:5: (lv_hasSystemSettings_9_0= 'systemSettings' )
                     {
-                    // InternalMenuDsl.g:450:6: (lv_hasProcess_8_0= 'process' )
-                    // InternalMenuDsl.g:451:7: lv_hasProcess_8_0= 'process'
+                    // InternalMenuDsl.g:442:5: (lv_hasSystemSettings_9_0= 'systemSettings' )
+                    // InternalMenuDsl.g:443:6: lv_hasSystemSettings_9_0= 'systemSettings'
                     {
-                    lv_hasProcess_8_0=(Token)match(input,26,FOLLOW_4); if (state.failed) return current;
+                    lv_hasSystemSettings_9_0=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(lv_hasProcess_8_0, grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_6_0_0_0());
-                      						
+                      						newLeafNode(lv_hasSystemSettings_9_0, grammarAccess.getMenuCategoryAccess().getHasSystemSettingsSystemSettingsKeyword_2_5_0());
+                      					
                     }
                     if ( state.backtracking==0 ) {
 
-                      							if (current==null) {
-                      								current = createModelElement(grammarAccess.getMenuEntryRule());
-                      							}
-                      							setWithLastConsumed(current, "hasProcess", true, "process");
-                      						
+                      						if (current==null) {
+                      							current = createModelElement(grammarAccess.getMenuCategoryRule());
+                      						}
+                      						setWithLastConsumed(current, "hasSystemSettings", true, "systemSettings");
+                      					
                     }
 
                     }
@@ -1224,62 +1171,250 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:463:5: ( (otherlv_9= RULE_ID ) )
-                    // InternalMenuDsl.g:464:6: (otherlv_9= RULE_ID )
+
+                    }
+                    break;
+                case 7 :
+                    // InternalMenuDsl.g:456:4: (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' )
                     {
-                    // InternalMenuDsl.g:464:6: (otherlv_9= RULE_ID )
-                    // InternalMenuDsl.g:465:7: otherlv_9= RULE_ID
+                    // InternalMenuDsl.g:456:4: (otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}' )
+                    // InternalMenuDsl.g:457:5: otherlv_10= '{' ( (lv_trees_11_0= ruleMenuTree ) )* otherlv_12= '}'
                     {
+                    otherlv_10=(Token)match(input,26,FOLLOW_13); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							if (current==null) {
-                      								current = createModelElement(grammarAccess.getMenuEntryRule());
-                      							}
-                      						
+                      					newLeafNode(otherlv_10, grammarAccess.getMenuCategoryAccess().getLeftCurlyBracketKeyword_2_6_0());
+                      				
                     }
-                    otherlv_9=(Token)match(input,RULE_ID,FOLLOW_5); if (state.failed) return current;
+                    // InternalMenuDsl.g:461:5: ( (lv_trees_11_0= ruleMenuTree ) )*
+                    loop7:
+                    do {
+                        int alt7=2;
+                        int LA7_0 = input.LA(1);
+
+                        if ( (LA7_0==28) ) {
+                            alt7=1;
+                        }
+
+
+                        switch (alt7) {
+                    	case 1 :
+                    	    // InternalMenuDsl.g:462:6: (lv_trees_11_0= ruleMenuTree )
+                    	    {
+                    	    // InternalMenuDsl.g:462:6: (lv_trees_11_0= ruleMenuTree )
+                    	    // InternalMenuDsl.g:463:7: lv_trees_11_0= ruleMenuTree
+                    	    {
+                    	    if ( state.backtracking==0 ) {
+
+                    	      							newCompositeNode(grammarAccess.getMenuCategoryAccess().getTreesMenuTreeParserRuleCall_2_6_1_0());
+                    	      						
+                    	    }
+                    	    pushFollow(FOLLOW_13);
+                    	    lv_trees_11_0=ruleMenuTree();
+
+                    	    state._fsp--;
+                    	    if (state.failed) return current;
+                    	    if ( state.backtracking==0 ) {
+
+                    	      							if (current==null) {
+                    	      								current = createModelElementForParent(grammarAccess.getMenuCategoryRule());
+                    	      							}
+                    	      							add(
+                    	      								current,
+                    	      								"trees",
+                    	      								lv_trees_11_0,
+                    	      								"org.eclipse.osbp.xtext.menu.MenuDsl.MenuTree");
+                    	      							afterParserOrEnumRuleCall();
+                    	      						
+                    	    }
+
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop7;
+                        }
+                    } while (true);
+
+                    otherlv_12=(Token)match(input,27,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(otherlv_9, grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_6_0_1_0());
-                      						
+                      					newLeafNode(otherlv_12, grammarAccess.getMenuCategoryAccess().getRightCurlyBracketKeyword_2_6_2());
+                      				
                     }
 
                     }
 
 
                     }
+                    break;
 
+            }
 
-                    }
 
+            }
 
-                    }
-                    break;
-                case 2 :
-                    // InternalMenuDsl.g:478:4: ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) )
-                    {
-                    // InternalMenuDsl.g:478:4: ( ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) ) )
-                    // InternalMenuDsl.g:479:5: ( (lv_hasPerspective_10_0= 'perspective' ) ) ( (otherlv_11= RULE_ID ) )
+
+            }
+
+            if ( state.backtracking==0 ) {
+
+              	leaveRule();
+
+            }
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleMenuCategory"
+
+
+    // $ANTLR start "entryRuleMenuTree"
+    // InternalMenuDsl.g:490:1: entryRuleMenuTree returns [EObject current=null] : iv_ruleMenuTree= ruleMenuTree EOF ;
+    public final EObject entryRuleMenuTree() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleMenuTree = null;
+
+
+        try {
+            // InternalMenuDsl.g:490:49: (iv_ruleMenuTree= ruleMenuTree EOF )
+            // InternalMenuDsl.g:491:2: iv_ruleMenuTree= ruleMenuTree EOF
+            {
+            if ( state.backtracking==0 ) {
+               newCompositeNode(grammarAccess.getMenuTreeRule()); 
+            }
+            pushFollow(FOLLOW_1);
+            iv_ruleMenuTree=ruleMenuTree();
+
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+               current =iv_ruleMenuTree; 
+            }
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleMenuTree"
+
+
+    // $ANTLR start "ruleMenuTree"
+    // InternalMenuDsl.g:497:1: ruleMenuTree returns [EObject current=null] : (otherlv_0= 'tree' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasTooltip_2_0= 'tooltip' ) ) ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) ) )? otherlv_4= '{' ( (lv_entries_5_0= ruleMenuEntry ) )* otherlv_6= '}' ) ;
+    public final EObject ruleMenuTree() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_0=null;
+        Token lv_hasTooltip_2_0=null;
+        Token otherlv_4=null;
+        Token otherlv_6=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
+        AntlrDatatypeRuleToken lv_tooltip_3_0 = null;
+
+        EObject lv_entries_5_0 = null;
+
+
+
+        	enterRule();
+
+        try {
+            // InternalMenuDsl.g:503:2: ( (otherlv_0= 'tree' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasTooltip_2_0= 'tooltip' ) ) ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) ) )? otherlv_4= '{' ( (lv_entries_5_0= ruleMenuEntry ) )* otherlv_6= '}' ) )
+            // InternalMenuDsl.g:504:2: (otherlv_0= 'tree' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasTooltip_2_0= 'tooltip' ) ) ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) ) )? otherlv_4= '{' ( (lv_entries_5_0= ruleMenuEntry ) )* otherlv_6= '}' )
+            {
+            // InternalMenuDsl.g:504:2: (otherlv_0= 'tree' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasTooltip_2_0= 'tooltip' ) ) ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) ) )? otherlv_4= '{' ( (lv_entries_5_0= ruleMenuEntry ) )* otherlv_6= '}' )
+            // InternalMenuDsl.g:505:3: otherlv_0= 'tree' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasTooltip_2_0= 'tooltip' ) ) ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) ) )? otherlv_4= '{' ( (lv_entries_5_0= ruleMenuEntry ) )* otherlv_6= '}'
+            {
+            otherlv_0=(Token)match(input,28,FOLLOW_4); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+
+              			newLeafNode(otherlv_0, grammarAccess.getMenuTreeAccess().getTreeKeyword_0());
+              		
+            }
+            // InternalMenuDsl.g:509:3: ( (lv_name_1_0= ruleTRANSLATABLEID ) )
+            // InternalMenuDsl.g:510:4: (lv_name_1_0= ruleTRANSLATABLEID )
+            {
+            // InternalMenuDsl.g:510:4: (lv_name_1_0= ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:511:5: lv_name_1_0= ruleTRANSLATABLEID
+            {
+            if ( state.backtracking==0 ) {
+
+              					newCompositeNode(grammarAccess.getMenuTreeAccess().getNameTRANSLATABLEIDParserRuleCall_1_0());
+              				
+            }
+            pushFollow(FOLLOW_14);
+            lv_name_1_0=ruleTRANSLATABLEID();
+
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+
+              					if (current==null) {
+              						current = createModelElementForParent(grammarAccess.getMenuTreeRule());
+              					}
+              					set(
+              						current,
+              						"name",
+              						lv_name_1_0,
+              						"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLEID");
+              					afterParserOrEnumRuleCall();
+              				
+            }
+
+            }
+
+
+            }
+
+            // InternalMenuDsl.g:528:3: ( ( (lv_hasTooltip_2_0= 'tooltip' ) ) ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) ) )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
+
+            if ( (LA9_0==29) ) {
+                alt9=1;
+            }
+            switch (alt9) {
+                case 1 :
+                    // InternalMenuDsl.g:529:4: ( (lv_hasTooltip_2_0= 'tooltip' ) ) ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) )
                     {
-                    // InternalMenuDsl.g:479:5: ( (lv_hasPerspective_10_0= 'perspective' ) )
-                    // InternalMenuDsl.g:480:6: (lv_hasPerspective_10_0= 'perspective' )
+                    // InternalMenuDsl.g:529:4: ( (lv_hasTooltip_2_0= 'tooltip' ) )
+                    // InternalMenuDsl.g:530:5: (lv_hasTooltip_2_0= 'tooltip' )
                     {
-                    // InternalMenuDsl.g:480:6: (lv_hasPerspective_10_0= 'perspective' )
-                    // InternalMenuDsl.g:481:7: lv_hasPerspective_10_0= 'perspective'
+                    // InternalMenuDsl.g:530:5: (lv_hasTooltip_2_0= 'tooltip' )
+                    // InternalMenuDsl.g:531:6: lv_hasTooltip_2_0= 'tooltip'
                     {
-                    lv_hasPerspective_10_0=(Token)match(input,27,FOLLOW_4); if (state.failed) return current;
+                    lv_hasTooltip_2_0=(Token)match(input,29,FOLLOW_6); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(lv_hasPerspective_10_0, grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_6_1_0_0());
-                      						
+                      						newLeafNode(lv_hasTooltip_2_0, grammarAccess.getMenuTreeAccess().getHasTooltipTooltipKeyword_2_0_0());
+                      					
                     }
                     if ( state.backtracking==0 ) {
 
-                      							if (current==null) {
-                      								current = createModelElement(grammarAccess.getMenuEntryRule());
-                      							}
-                      							setWithLastConsumed(current, "hasPerspective", true, "perspective");
-                      						
+                      						if (current==null) {
+                      							current = createModelElement(grammarAccess.getMenuTreeRule());
+                      						}
+                      						setWithLastConsumed(current, "hasTooltip", true, "tooltip");
+                      					
                     }
 
                     }
@@ -1287,24 +1422,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:493:5: ( (otherlv_11= RULE_ID ) )
-                    // InternalMenuDsl.g:494:6: (otherlv_11= RULE_ID )
+                    // InternalMenuDsl.g:543:4: ( (lv_tooltip_3_0= ruleTRANSLATABLESTRING ) )
+                    // InternalMenuDsl.g:544:5: (lv_tooltip_3_0= ruleTRANSLATABLESTRING )
                     {
-                    // InternalMenuDsl.g:494:6: (otherlv_11= RULE_ID )
-                    // InternalMenuDsl.g:495:7: otherlv_11= RULE_ID
+                    // InternalMenuDsl.g:544:5: (lv_tooltip_3_0= ruleTRANSLATABLESTRING )
+                    // InternalMenuDsl.g:545:6: lv_tooltip_3_0= ruleTRANSLATABLESTRING
                     {
                     if ( state.backtracking==0 ) {
 
-                      							if (current==null) {
-                      								current = createModelElement(grammarAccess.getMenuEntryRule());
-                      							}
-                      						
+                      						newCompositeNode(grammarAccess.getMenuTreeAccess().getTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0());
+                      					
                     }
-                    otherlv_11=(Token)match(input,RULE_ID,FOLLOW_5); if (state.failed) return current;
+                    pushFollow(FOLLOW_15);
+                    lv_tooltip_3_0=ruleTRANSLATABLESTRING();
+
+                    state._fsp--;
+                    if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(otherlv_11, grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_6_1_1_0());
-                      						
+                      						if (current==null) {
+                      							current = createModelElementForParent(grammarAccess.getMenuTreeRule());
+                      						}
+                      						set(
+                      							current,
+                      							"tooltip",
+                      							lv_tooltip_3_0,
+                      							"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLESTRING");
+                      						afterParserOrEnumRuleCall();
+                      					
                     }
 
                     }
@@ -1314,35 +1459,235 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
                     }
+                    break;
 
+            }
 
-                    }
-                    break;
-                case 3 :
-                    // InternalMenuDsl.g:508:4: ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) )
-                    {
-                    // InternalMenuDsl.g:508:4: ( ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) ) )
-                    // InternalMenuDsl.g:509:5: ( (lv_hasTable_12_0= 'table' ) ) ( (otherlv_13= RULE_ID ) )
+            otherlv_4=(Token)match(input,26,FOLLOW_16); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+
+              			newLeafNode(otherlv_4, grammarAccess.getMenuTreeAccess().getLeftCurlyBracketKeyword_3());
+              		
+            }
+            // InternalMenuDsl.g:567:3: ( (lv_entries_5_0= ruleMenuEntry ) )*
+            loop10:
+            do {
+                int alt10=2;
+                int LA10_0 = input.LA(1);
+
+                if ( (LA10_0==30) ) {
+                    alt10=1;
+                }
+
+
+                switch (alt10) {
+            	case 1 :
+            	    // InternalMenuDsl.g:568:4: (lv_entries_5_0= ruleMenuEntry )
+            	    {
+            	    // InternalMenuDsl.g:568:4: (lv_entries_5_0= ruleMenuEntry )
+            	    // InternalMenuDsl.g:569:5: lv_entries_5_0= ruleMenuEntry
+            	    {
+            	    if ( state.backtracking==0 ) {
+
+            	      					newCompositeNode(grammarAccess.getMenuTreeAccess().getEntriesMenuEntryParserRuleCall_4_0());
+            	      				
+            	    }
+            	    pushFollow(FOLLOW_16);
+            	    lv_entries_5_0=ruleMenuEntry();
+
+            	    state._fsp--;
+            	    if (state.failed) return current;
+            	    if ( state.backtracking==0 ) {
+
+            	      					if (current==null) {
+            	      						current = createModelElementForParent(grammarAccess.getMenuTreeRule());
+            	      					}
+            	      					add(
+            	      						current,
+            	      						"entries",
+            	      						lv_entries_5_0,
+            	      						"org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
+            	      					afterParserOrEnumRuleCall();
+            	      				
+            	    }
+
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop10;
+                }
+            } while (true);
+
+            otherlv_6=(Token)match(input,27,FOLLOW_2); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+
+              			newLeafNode(otherlv_6, grammarAccess.getMenuTreeAccess().getRightCurlyBracketKeyword_5());
+              		
+            }
+
+            }
+
+
+            }
+
+            if ( state.backtracking==0 ) {
+
+              	leaveRule();
+
+            }
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleMenuTree"
+
+
+    // $ANTLR start "entryRuleMenuEntry"
+    // InternalMenuDsl.g:594:1: entryRuleMenuEntry returns [EObject current=null] : iv_ruleMenuEntry= ruleMenuEntry EOF ;
+    public final EObject entryRuleMenuEntry() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleMenuEntry = null;
+
+
+        try {
+            // InternalMenuDsl.g:594:50: (iv_ruleMenuEntry= ruleMenuEntry EOF )
+            // InternalMenuDsl.g:595:2: iv_ruleMenuEntry= ruleMenuEntry EOF
+            {
+            if ( state.backtracking==0 ) {
+               newCompositeNode(grammarAccess.getMenuEntryRule()); 
+            }
+            pushFollow(FOLLOW_1);
+            iv_ruleMenuEntry=ruleMenuEntry();
+
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+               current =iv_ruleMenuEntry; 
+            }
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleMenuEntry"
+
+
+    // $ANTLR start "ruleMenuEntry"
+    // InternalMenuDsl.g:601:1: ruleMenuEntry returns [EObject current=null] : (otherlv_0= 'entry' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasIcon_2_0= 'icon' ) ) ( (lv_icon_3_0= RULE_STRING ) ) )? ( ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) ) ) ) ;
+    public final EObject ruleMenuEntry() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_0=null;
+        Token lv_hasIcon_2_0=null;
+        Token lv_icon_3_0=null;
+        Token lv_hasProcess_4_0=null;
+        Token otherlv_5=null;
+        Token lv_hasPerspective_6_0=null;
+        Token otherlv_7=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
+
+
+        	enterRule();
+
+        try {
+            // InternalMenuDsl.g:607:2: ( (otherlv_0= 'entry' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasIcon_2_0= 'icon' ) ) ( (lv_icon_3_0= RULE_STRING ) ) )? ( ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) ) ) ) )
+            // InternalMenuDsl.g:608:2: (otherlv_0= 'entry' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasIcon_2_0= 'icon' ) ) ( (lv_icon_3_0= RULE_STRING ) ) )? ( ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) ) ) )
+            {
+            // InternalMenuDsl.g:608:2: (otherlv_0= 'entry' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasIcon_2_0= 'icon' ) ) ( (lv_icon_3_0= RULE_STRING ) ) )? ( ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) ) ) )
+            // InternalMenuDsl.g:609:3: otherlv_0= 'entry' ( (lv_name_1_0= ruleTRANSLATABLEID ) ) ( ( (lv_hasIcon_2_0= 'icon' ) ) ( (lv_icon_3_0= RULE_STRING ) ) )? ( ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) ) )
+            {
+            otherlv_0=(Token)match(input,30,FOLLOW_4); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+
+              			newLeafNode(otherlv_0, grammarAccess.getMenuEntryAccess().getEntryKeyword_0());
+              		
+            }
+            // InternalMenuDsl.g:613:3: ( (lv_name_1_0= ruleTRANSLATABLEID ) )
+            // InternalMenuDsl.g:614:4: (lv_name_1_0= ruleTRANSLATABLEID )
+            {
+            // InternalMenuDsl.g:614:4: (lv_name_1_0= ruleTRANSLATABLEID )
+            // InternalMenuDsl.g:615:5: lv_name_1_0= ruleTRANSLATABLEID
+            {
+            if ( state.backtracking==0 ) {
+
+              					newCompositeNode(grammarAccess.getMenuEntryAccess().getNameTRANSLATABLEIDParserRuleCall_1_0());
+              				
+            }
+            pushFollow(FOLLOW_17);
+            lv_name_1_0=ruleTRANSLATABLEID();
+
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+
+              					if (current==null) {
+              						current = createModelElementForParent(grammarAccess.getMenuEntryRule());
+              					}
+              					set(
+              						current,
+              						"name",
+              						lv_name_1_0,
+              						"org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLEID");
+              					afterParserOrEnumRuleCall();
+              				
+            }
+
+            }
+
+
+            }
+
+            // InternalMenuDsl.g:632:3: ( ( (lv_hasIcon_2_0= 'icon' ) ) ( (lv_icon_3_0= RULE_STRING ) ) )?
+            int alt11=2;
+            int LA11_0 = input.LA(1);
+
+            if ( (LA11_0==31) ) {
+                alt11=1;
+            }
+            switch (alt11) {
+                case 1 :
+                    // InternalMenuDsl.g:633:4: ( (lv_hasIcon_2_0= 'icon' ) ) ( (lv_icon_3_0= RULE_STRING ) )
                     {
-                    // InternalMenuDsl.g:509:5: ( (lv_hasTable_12_0= 'table' ) )
-                    // InternalMenuDsl.g:510:6: (lv_hasTable_12_0= 'table' )
+                    // InternalMenuDsl.g:633:4: ( (lv_hasIcon_2_0= 'icon' ) )
+                    // InternalMenuDsl.g:634:5: (lv_hasIcon_2_0= 'icon' )
                     {
-                    // InternalMenuDsl.g:510:6: (lv_hasTable_12_0= 'table' )
-                    // InternalMenuDsl.g:511:7: lv_hasTable_12_0= 'table'
+                    // InternalMenuDsl.g:634:5: (lv_hasIcon_2_0= 'icon' )
+                    // InternalMenuDsl.g:635:6: lv_hasIcon_2_0= 'icon'
                     {
-                    lv_hasTable_12_0=(Token)match(input,28,FOLLOW_4); if (state.failed) return current;
+                    lv_hasIcon_2_0=(Token)match(input,31,FOLLOW_6); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(lv_hasTable_12_0, grammarAccess.getMenuEntryAccess().getHasTableTableKeyword_6_2_0_0());
-                      						
+                      						newLeafNode(lv_hasIcon_2_0, grammarAccess.getMenuEntryAccess().getHasIconIconKeyword_2_0_0());
+                      					
                     }
                     if ( state.backtracking==0 ) {
 
-                      							if (current==null) {
-                      								current = createModelElement(grammarAccess.getMenuEntryRule());
-                      							}
-                      							setWithLastConsumed(current, "hasTable", true, "table");
-                      						
+                      						if (current==null) {
+                      							current = createModelElement(grammarAccess.getMenuEntryRule());
+                      						}
+                      						setWithLastConsumed(current, "hasIcon", true, "icon");
+                      					
                     }
 
                     }
@@ -1350,24 +1695,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:523:5: ( (otherlv_13= RULE_ID ) )
-                    // InternalMenuDsl.g:524:6: (otherlv_13= RULE_ID )
+                    // InternalMenuDsl.g:647:4: ( (lv_icon_3_0= RULE_STRING ) )
+                    // InternalMenuDsl.g:648:5: (lv_icon_3_0= RULE_STRING )
                     {
-                    // InternalMenuDsl.g:524:6: (otherlv_13= RULE_ID )
-                    // InternalMenuDsl.g:525:7: otherlv_13= RULE_ID
+                    // InternalMenuDsl.g:648:5: (lv_icon_3_0= RULE_STRING )
+                    // InternalMenuDsl.g:649:6: lv_icon_3_0= RULE_STRING
                     {
+                    lv_icon_3_0=(Token)match(input,RULE_STRING,FOLLOW_18); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							if (current==null) {
-                      								current = createModelElement(grammarAccess.getMenuEntryRule());
-                      							}
-                      						
+                      						newLeafNode(lv_icon_3_0, grammarAccess.getMenuEntryAccess().getIconSTRINGTerminalRuleCall_2_1_0());
+                      					
                     }
-                    otherlv_13=(Token)match(input,RULE_ID,FOLLOW_5); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(otherlv_13, grammarAccess.getMenuEntryAccess().getTableTableCrossReference_6_2_1_0());
-                      						
+                      						if (current==null) {
+                      							current = createModelElement(grammarAccess.getMenuEntryRule());
+                      						}
+                      						setWithLastConsumed(
+                      							current,
+                      							"icon",
+                      							lv_icon_3_0,
+                      							"org.eclipse.xtext.xbase.Xtype.STRING");
+                      					
                     }
 
                     }
@@ -1377,26 +1727,44 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
                     }
+                    break;
 
+            }
 
-                    }
-                    break;
-                case 4 :
-                    // InternalMenuDsl.g:538:4: ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) )
+            // InternalMenuDsl.g:666:3: ( ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) ) | ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) ) )
+            int alt12=2;
+            int LA12_0 = input.LA(1);
+
+            if ( (LA12_0==32) ) {
+                alt12=1;
+            }
+            else if ( (LA12_0==33) ) {
+                alt12=2;
+            }
+            else {
+                if (state.backtracking>0) {state.failed=true; return current;}
+                NoViableAltException nvae =
+                    new NoViableAltException("", 12, 0, input);
+
+                throw nvae;
+            }
+            switch (alt12) {
+                case 1 :
+                    // InternalMenuDsl.g:667:4: ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) )
                     {
-                    // InternalMenuDsl.g:538:4: ( ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) ) )
-                    // InternalMenuDsl.g:539:5: ( (lv_hasDialog_14_0= 'dialog' ) ) ( (otherlv_15= RULE_ID ) )
+                    // InternalMenuDsl.g:667:4: ( ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) ) )
+                    // InternalMenuDsl.g:668:5: ( (lv_hasProcess_4_0= 'process' ) ) ( (otherlv_5= RULE_ID ) )
                     {
-                    // InternalMenuDsl.g:539:5: ( (lv_hasDialog_14_0= 'dialog' ) )
-                    // InternalMenuDsl.g:540:6: (lv_hasDialog_14_0= 'dialog' )
+                    // InternalMenuDsl.g:668:5: ( (lv_hasProcess_4_0= 'process' ) )
+                    // InternalMenuDsl.g:669:6: (lv_hasProcess_4_0= 'process' )
                     {
-                    // InternalMenuDsl.g:540:6: (lv_hasDialog_14_0= 'dialog' )
-                    // InternalMenuDsl.g:541:7: lv_hasDialog_14_0= 'dialog'
+                    // InternalMenuDsl.g:669:6: (lv_hasProcess_4_0= 'process' )
+                    // InternalMenuDsl.g:670:7: lv_hasProcess_4_0= 'process'
                     {
-                    lv_hasDialog_14_0=(Token)match(input,29,FOLLOW_4); if (state.failed) return current;
+                    lv_hasProcess_4_0=(Token)match(input,32,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(lv_hasDialog_14_0, grammarAccess.getMenuEntryAccess().getHasDialogDialogKeyword_6_3_0_0());
+                      							newLeafNode(lv_hasProcess_4_0, grammarAccess.getMenuEntryAccess().getHasProcessProcessKeyword_3_0_0_0());
                       						
                     }
                     if ( state.backtracking==0 ) {
@@ -1404,7 +1772,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       							if (current==null) {
                       								current = createModelElement(grammarAccess.getMenuEntryRule());
                       							}
-                      							setWithLastConsumed(current, "hasDialog", true, "dialog");
+                      							setWithLastConsumed(current, "hasProcess", true, "process");
                       						
                     }
 
@@ -1413,11 +1781,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:553:5: ( (otherlv_15= RULE_ID ) )
-                    // InternalMenuDsl.g:554:6: (otherlv_15= RULE_ID )
+                    // InternalMenuDsl.g:682:5: ( (otherlv_5= RULE_ID ) )
+                    // InternalMenuDsl.g:683:6: (otherlv_5= RULE_ID )
                     {
-                    // InternalMenuDsl.g:554:6: (otherlv_15= RULE_ID )
-                    // InternalMenuDsl.g:555:7: otherlv_15= RULE_ID
+                    // InternalMenuDsl.g:683:6: (otherlv_5= RULE_ID )
+                    // InternalMenuDsl.g:684:7: otherlv_5= RULE_ID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1426,10 +1794,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       							}
                       						
                     }
-                    otherlv_15=(Token)match(input,RULE_ID,FOLLOW_5); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      							newLeafNode(otherlv_15, grammarAccess.getMenuEntryAccess().getDialogDialogCrossReference_6_3_1_0());
+                      							newLeafNode(otherlv_5, grammarAccess.getMenuEntryAccess().getProcessBlipCrossReference_3_0_1_0());
                       						
                     }
 
@@ -1444,28 +1812,31 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
                     break;
-                case 5 :
-                    // InternalMenuDsl.g:568:4: ( (lv_hasUserFilter_16_0= 'userFilter' ) )
+                case 2 :
+                    // InternalMenuDsl.g:697:4: ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) )
+                    {
+                    // InternalMenuDsl.g:697:4: ( ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) ) )
+                    // InternalMenuDsl.g:698:5: ( (lv_hasPerspective_6_0= 'perspective' ) ) ( (otherlv_7= RULE_ID ) )
                     {
-                    // InternalMenuDsl.g:568:4: ( (lv_hasUserFilter_16_0= 'userFilter' ) )
-                    // InternalMenuDsl.g:569:5: (lv_hasUserFilter_16_0= 'userFilter' )
+                    // InternalMenuDsl.g:698:5: ( (lv_hasPerspective_6_0= 'perspective' ) )
+                    // InternalMenuDsl.g:699:6: (lv_hasPerspective_6_0= 'perspective' )
                     {
-                    // InternalMenuDsl.g:569:5: (lv_hasUserFilter_16_0= 'userFilter' )
-                    // InternalMenuDsl.g:570:6: lv_hasUserFilter_16_0= 'userFilter'
+                    // InternalMenuDsl.g:699:6: (lv_hasPerspective_6_0= 'perspective' )
+                    // InternalMenuDsl.g:700:7: lv_hasPerspective_6_0= 'perspective'
                     {
-                    lv_hasUserFilter_16_0=(Token)match(input,30,FOLLOW_5); if (state.failed) return current;
+                    lv_hasPerspective_6_0=(Token)match(input,33,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						newLeafNode(lv_hasUserFilter_16_0, grammarAccess.getMenuEntryAccess().getHasUserFilterUserFilterKeyword_6_4_0());
-                      					
+                      							newLeafNode(lv_hasPerspective_6_0, grammarAccess.getMenuEntryAccess().getHasPerspectivePerspectiveKeyword_3_1_0_0());
+                      						
                     }
                     if ( state.backtracking==0 ) {
 
-                      						if (current==null) {
-                      							current = createModelElement(grammarAccess.getMenuEntryRule());
-                      						}
-                      						setWithLastConsumed(current, "hasUserFilter", true, "userFilter");
-                      					
+                      							if (current==null) {
+                      								current = createModelElement(grammarAccess.getMenuEntryRule());
+                      							}
+                      							setWithLastConsumed(current, "hasPerspective", true, "perspective");
+                      						
                     }
 
                     }
@@ -1473,31 +1844,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-
-                    }
-                    break;
-                case 6 :
-                    // InternalMenuDsl.g:583:4: ( (lv_hasKeyBinding_17_0= 'keyBinding' ) )
-                    {
-                    // InternalMenuDsl.g:583:4: ( (lv_hasKeyBinding_17_0= 'keyBinding' ) )
-                    // InternalMenuDsl.g:584:5: (lv_hasKeyBinding_17_0= 'keyBinding' )
+                    // InternalMenuDsl.g:712:5: ( (otherlv_7= RULE_ID ) )
+                    // InternalMenuDsl.g:713:6: (otherlv_7= RULE_ID )
                     {
-                    // InternalMenuDsl.g:584:5: (lv_hasKeyBinding_17_0= 'keyBinding' )
-                    // InternalMenuDsl.g:585:6: lv_hasKeyBinding_17_0= 'keyBinding'
+                    // InternalMenuDsl.g:713:6: (otherlv_7= RULE_ID )
+                    // InternalMenuDsl.g:714:7: otherlv_7= RULE_ID
                     {
-                    lv_hasKeyBinding_17_0=(Token)match(input,31,FOLLOW_5); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						newLeafNode(lv_hasKeyBinding_17_0, grammarAccess.getMenuEntryAccess().getHasKeyBindingKeyBindingKeyword_6_5_0());
-                      					
+                      							if (current==null) {
+                      								current = createModelElement(grammarAccess.getMenuEntryRule());
+                      							}
+                      						
                     }
+                    otherlv_7=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                      						if (current==null) {
-                      							current = createModelElement(grammarAccess.getMenuEntryRule());
-                      						}
-                      						setWithLastConsumed(current, "hasKeyBinding", true, "keyBinding");
-                      					
+                      							newLeafNode(otherlv_7, grammarAccess.getMenuEntryAccess().getPerspectivePerspectiveCrossReference_3_1_1_0());
+                      						
                     }
 
                     }
@@ -1507,86 +1871,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
                     }
-                    break;
-
-            }
-
-            // InternalMenuDsl.g:598:3: (otherlv_18= '{' ( (lv_subentries_19_0= ruleMenuEntry ) )* otherlv_20= '}' )?
-            int alt14=2;
-            int LA14_0 = input.LA(1);
-
-            if ( (LA14_0==14) ) {
-                alt14=1;
-            }
-            switch (alt14) {
-                case 1 :
-                    // InternalMenuDsl.g:599:4: otherlv_18= '{' ( (lv_subentries_19_0= ruleMenuEntry ) )* otherlv_20= '}'
-                    {
-                    otherlv_18=(Token)match(input,14,FOLLOW_13); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                      				newLeafNode(otherlv_18, grammarAccess.getMenuEntryAccess().getLeftCurlyBracketKeyword_7_0());
-                      			
-                    }
-                    // InternalMenuDsl.g:603:4: ( (lv_subentries_19_0= ruleMenuEntry ) )*
-                    loop13:
-                    do {
-                        int alt13=2;
-                        int LA13_0 = input.LA(1);
-
-                        if ( (LA13_0==22) ) {
-                            alt13=1;
-                        }
-
-
-                        switch (alt13) {
-                    	case 1 :
-                    	    // InternalMenuDsl.g:604:5: (lv_subentries_19_0= ruleMenuEntry )
-                    	    {
-                    	    // InternalMenuDsl.g:604:5: (lv_subentries_19_0= ruleMenuEntry )
-                    	    // InternalMenuDsl.g:605:6: lv_subentries_19_0= ruleMenuEntry
-                    	    {
-                    	    if ( state.backtracking==0 ) {
-
-                    	      						newCompositeNode(grammarAccess.getMenuEntryAccess().getSubentriesMenuEntryParserRuleCall_7_1_0());
-                    	      					
-                    	    }
-                    	    pushFollow(FOLLOW_13);
-                    	    lv_subentries_19_0=ruleMenuEntry();
-
-                    	    state._fsp--;
-                    	    if (state.failed) return current;
-                    	    if ( state.backtracking==0 ) {
-
-                    	      						if (current==null) {
-                    	      							current = createModelElementForParent(grammarAccess.getMenuEntryRule());
-                    	      						}
-                    	      						add(
-                    	      							current,
-                    	      							"subentries",
-                    	      							lv_subentries_19_0,
-                    	      							"org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
-                    	      						afterParserOrEnumRuleCall();
-                    	      					
-                    	    }
-
-                    	    }
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop13;
-                        }
-                    } while (true);
-
-                    otherlv_20=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
 
-                      				newLeafNode(otherlv_20, grammarAccess.getMenuEntryAccess().getRightCurlyBracketKeyword_7_2());
-                      			
-                    }
 
                     }
                     break;
@@ -1618,7 +1903,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTRANSLATABLESTRING"
-    // InternalMenuDsl.g:631:1: entryRuleTRANSLATABLESTRING returns [String current=null] : iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF ;
+    // InternalMenuDsl.g:731:1: entryRuleTRANSLATABLESTRING returns [String current=null] : iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF ;
     public final String entryRuleTRANSLATABLESTRING() throws RecognitionException {
         String current = null;
 
@@ -1626,8 +1911,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:631:58: (iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF )
-            // InternalMenuDsl.g:632:2: iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF
+            // InternalMenuDsl.g:731:58: (iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF )
+            // InternalMenuDsl.g:732:2: iv_ruleTRANSLATABLESTRING= ruleTRANSLATABLESTRING EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTRANSLATABLESTRINGRule()); 
@@ -1658,7 +1943,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTRANSLATABLESTRING"
-    // InternalMenuDsl.g:638:1: ruleTRANSLATABLESTRING returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_STRING_0= RULE_STRING ;
+    // InternalMenuDsl.g:738:1: ruleTRANSLATABLESTRING returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_STRING_0= RULE_STRING ;
     public final AntlrDatatypeRuleToken ruleTRANSLATABLESTRING() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -1668,8 +1953,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:644:2: (this_STRING_0= RULE_STRING )
-            // InternalMenuDsl.g:645:2: this_STRING_0= RULE_STRING
+            // InternalMenuDsl.g:744:2: (this_STRING_0= RULE_STRING )
+            // InternalMenuDsl.g:745: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 ) {
@@ -1704,7 +1989,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTRANSLATABLEID"
-    // InternalMenuDsl.g:655:1: entryRuleTRANSLATABLEID returns [String current=null] : iv_ruleTRANSLATABLEID= ruleTRANSLATABLEID EOF ;
+    // InternalMenuDsl.g:755:1: entryRuleTRANSLATABLEID returns [String current=null] : iv_ruleTRANSLATABLEID= ruleTRANSLATABLEID EOF ;
     public final String entryRuleTRANSLATABLEID() throws RecognitionException {
         String current = null;
 
@@ -1712,8 +1997,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:655:54: (iv_ruleTRANSLATABLEID= ruleTRANSLATABLEID EOF )
-            // InternalMenuDsl.g:656:2: iv_ruleTRANSLATABLEID= ruleTRANSLATABLEID EOF
+            // InternalMenuDsl.g:755:54: (iv_ruleTRANSLATABLEID= ruleTRANSLATABLEID EOF )
+            // InternalMenuDsl.g:756:2: iv_ruleTRANSLATABLEID= ruleTRANSLATABLEID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTRANSLATABLEIDRule()); 
@@ -1744,7 +2029,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTRANSLATABLEID"
-    // InternalMenuDsl.g:662:1: ruleTRANSLATABLEID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalMenuDsl.g:762:1: ruleTRANSLATABLEID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleTRANSLATABLEID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -1754,8 +2039,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:668:2: (this_ID_0= RULE_ID )
-            // InternalMenuDsl.g:669:2: this_ID_0= RULE_ID
+            // InternalMenuDsl.g:768:2: (this_ID_0= RULE_ID )
+            // InternalMenuDsl.g:769: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 ) {
@@ -1790,7 +2075,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // InternalMenuDsl.g:679:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
+    // InternalMenuDsl.g:779:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
     public final EObject entryRuleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -1798,8 +2083,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:679:59: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
-            // InternalMenuDsl.g:680:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
+            // InternalMenuDsl.g:779:59: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
+            // InternalMenuDsl.g:780:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportDeclarationRule()); 
@@ -1830,7 +2115,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // InternalMenuDsl.g:686: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= ';' )? ) ;
+    // InternalMenuDsl.g:786: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;
 
@@ -1851,14 +2136,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:692: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= ';' )? ) )
-            // InternalMenuDsl.g:693: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= ';' )? )
+            // InternalMenuDsl.g:792: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= ';' )? ) )
+            // InternalMenuDsl.g:793: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= ';' )? )
             {
-            // InternalMenuDsl.g:693: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= ';' )? )
-            // InternalMenuDsl.g:694: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= ';' )?
+            // InternalMenuDsl.g:793: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= ';' )? )
+            // InternalMenuDsl.g:794: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= ';' )?
             {
-            // InternalMenuDsl.g:694:3: ()
-            // InternalMenuDsl.g:695:4: 
+            // InternalMenuDsl.g:794:3: ()
+            // InternalMenuDsl.g:795:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -1870,29 +2155,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,32,FOLLOW_18); if (state.failed) return current;
+            otherlv_1=(Token)match(input,34,FOLLOW_19); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXImportDeclarationAccess().getImportKeyword_1());
               		
             }
-            // InternalMenuDsl.g:705: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 alt17=4;
-            alt17 = dfa17.predict(input);
-            switch (alt17) {
+            // InternalMenuDsl.g:805: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 alt15=4;
+            alt15 = dfa15.predict(input);
+            switch (alt15) {
                 case 1 :
-                    // InternalMenuDsl.g:706:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
+                    // InternalMenuDsl.g:806:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
                     {
-                    // InternalMenuDsl.g:706:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
-                    // InternalMenuDsl.g:707:5: ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
+                    // InternalMenuDsl.g:806:4: ( ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) ) )
+                    // InternalMenuDsl.g:807:5: ( (lv_static_2_0= 'static' ) ) ( (lv_extension_3_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
                     {
-                    // InternalMenuDsl.g:707:5: ( (lv_static_2_0= 'static' ) )
-                    // InternalMenuDsl.g:708:6: (lv_static_2_0= 'static' )
+                    // InternalMenuDsl.g:807:5: ( (lv_static_2_0= 'static' ) )
+                    // InternalMenuDsl.g:808:6: (lv_static_2_0= 'static' )
                     {
-                    // InternalMenuDsl.g:708:6: (lv_static_2_0= 'static' )
-                    // InternalMenuDsl.g:709:7: lv_static_2_0= 'static'
+                    // InternalMenuDsl.g:808:6: (lv_static_2_0= 'static' )
+                    // InternalMenuDsl.g:809:7: lv_static_2_0= 'static'
                     {
-                    lv_static_2_0=(Token)match(input,33,FOLLOW_19); if (state.failed) return current;
+                    lv_static_2_0=(Token)match(input,35,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(lv_static_2_0, grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_2_0_0_0());
@@ -1912,21 +2197,21 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:721:5: ( (lv_extension_3_0= 'extension' ) )?
-                    int alt15=2;
-                    int LA15_0 = input.LA(1);
+                    // InternalMenuDsl.g:821:5: ( (lv_extension_3_0= 'extension' ) )?
+                    int alt13=2;
+                    int LA13_0 = input.LA(1);
 
-                    if ( (LA15_0==34) ) {
-                        alt15=1;
+                    if ( (LA13_0==36) ) {
+                        alt13=1;
                     }
-                    switch (alt15) {
+                    switch (alt13) {
                         case 1 :
-                            // InternalMenuDsl.g:722:6: (lv_extension_3_0= 'extension' )
+                            // InternalMenuDsl.g:822:6: (lv_extension_3_0= 'extension' )
                             {
-                            // InternalMenuDsl.g:722:6: (lv_extension_3_0= 'extension' )
-                            // InternalMenuDsl.g:723:7: lv_extension_3_0= 'extension'
+                            // InternalMenuDsl.g:822:6: (lv_extension_3_0= 'extension' )
+                            // InternalMenuDsl.g:823:7: lv_extension_3_0= 'extension'
                             {
-                            lv_extension_3_0=(Token)match(input,34,FOLLOW_19); if (state.failed) return current;
+                            lv_extension_3_0=(Token)match(input,36,FOLLOW_20); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							newLeafNode(lv_extension_3_0, grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_2_0_1_0());
@@ -1949,11 +2234,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:735:5: ( ( ruleQualifiedNameInStaticImport ) )
-                    // InternalMenuDsl.g:736:6: ( ruleQualifiedNameInStaticImport )
+                    // InternalMenuDsl.g:835:5: ( ( ruleQualifiedNameInStaticImport ) )
+                    // InternalMenuDsl.g:836:6: ( ruleQualifiedNameInStaticImport )
                     {
-                    // InternalMenuDsl.g:736:6: ( ruleQualifiedNameInStaticImport )
-                    // InternalMenuDsl.g:737:7: ruleQualifiedNameInStaticImport
+                    // InternalMenuDsl.g:836:6: ( ruleQualifiedNameInStaticImport )
+                    // InternalMenuDsl.g:837:7: ruleQualifiedNameInStaticImport
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1967,7 +2252,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       							newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_0_2_0());
                       						
                     }
-                    pushFollow(FOLLOW_20);
+                    pushFollow(FOLLOW_21);
                     ruleQualifiedNameInStaticImport();
 
                     state._fsp--;
@@ -1983,34 +2268,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:751:5: ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
-                    int alt16=2;
-                    int LA16_0 = input.LA(1);
+                    // InternalMenuDsl.g:851:5: ( ( (lv_wildcard_5_0= '*' ) ) | ( (lv_memberName_6_0= ruleValidID ) ) )
+                    int alt14=2;
+                    int LA14_0 = input.LA(1);
 
-                    if ( (LA16_0==35) ) {
-                        alt16=1;
+                    if ( (LA14_0==37) ) {
+                        alt14=1;
                     }
-                    else if ( (LA16_0==RULE_ID) ) {
-                        alt16=2;
+                    else if ( (LA14_0==RULE_ID) ) {
+                        alt14=2;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 16, 0, input);
+                            new NoViableAltException("", 14, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt16) {
+                    switch (alt14) {
                         case 1 :
-                            // InternalMenuDsl.g:752:6: ( (lv_wildcard_5_0= '*' ) )
+                            // InternalMenuDsl.g:852:6: ( (lv_wildcard_5_0= '*' ) )
                             {
-                            // InternalMenuDsl.g:752:6: ( (lv_wildcard_5_0= '*' ) )
-                            // InternalMenuDsl.g:753:7: (lv_wildcard_5_0= '*' )
+                            // InternalMenuDsl.g:852:6: ( (lv_wildcard_5_0= '*' ) )
+                            // InternalMenuDsl.g:853:7: (lv_wildcard_5_0= '*' )
                             {
-                            // InternalMenuDsl.g:753:7: (lv_wildcard_5_0= '*' )
-                            // InternalMenuDsl.g:754:8: lv_wildcard_5_0= '*'
+                            // InternalMenuDsl.g:853:7: (lv_wildcard_5_0= '*' )
+                            // InternalMenuDsl.g:854:8: lv_wildcard_5_0= '*'
                             {
-                            lv_wildcard_5_0=(Token)match(input,35,FOLLOW_21); if (state.failed) return current;
+                            lv_wildcard_5_0=(Token)match(input,37,FOLLOW_22); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               								newLeafNode(lv_wildcard_5_0, grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_2_0_3_0_0());
@@ -2034,20 +2319,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:767:6: ( (lv_memberName_6_0= ruleValidID ) )
+                            // InternalMenuDsl.g:867:6: ( (lv_memberName_6_0= ruleValidID ) )
                             {
-                            // InternalMenuDsl.g:767:6: ( (lv_memberName_6_0= ruleValidID ) )
-                            // InternalMenuDsl.g:768:7: (lv_memberName_6_0= ruleValidID )
+                            // InternalMenuDsl.g:867:6: ( (lv_memberName_6_0= ruleValidID ) )
+                            // InternalMenuDsl.g:868:7: (lv_memberName_6_0= ruleValidID )
                             {
-                            // InternalMenuDsl.g:768:7: (lv_memberName_6_0= ruleValidID )
-                            // InternalMenuDsl.g:769:8: lv_memberName_6_0= ruleValidID
+                            // InternalMenuDsl.g:868:7: (lv_memberName_6_0= ruleValidID )
+                            // InternalMenuDsl.g:869:8: lv_memberName_6_0= ruleValidID
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_2_0_3_1_0());
                               							
                             }
-                            pushFollow(FOLLOW_21);
+                            pushFollow(FOLLOW_22);
                             lv_memberName_6_0=ruleValidID();
 
                             state._fsp--;
@@ -2084,13 +2369,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:789:4: ( ( ruleQualifiedName ) )
+                    // InternalMenuDsl.g:889:4: ( ( ruleQualifiedName ) )
                     {
-                    // InternalMenuDsl.g:789:4: ( ( ruleQualifiedName ) )
-                    // InternalMenuDsl.g:790:5: ( ruleQualifiedName )
+                    // InternalMenuDsl.g:889:4: ( ( ruleQualifiedName ) )
+                    // InternalMenuDsl.g:890:5: ( ruleQualifiedName )
                     {
-                    // InternalMenuDsl.g:790:5: ( ruleQualifiedName )
-                    // InternalMenuDsl.g:791:6: ruleQualifiedName
+                    // InternalMenuDsl.g:890:5: ( ruleQualifiedName )
+                    // InternalMenuDsl.g:891:6: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2104,7 +2389,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       						newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_2_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_21);
+                    pushFollow(FOLLOW_22);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -2124,20 +2409,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:806:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalMenuDsl.g:906:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
                     {
-                    // InternalMenuDsl.g:806:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
-                    // InternalMenuDsl.g:807:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
+                    // InternalMenuDsl.g:906:4: ( (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalMenuDsl.g:907:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
                     {
-                    // InternalMenuDsl.g:807:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
-                    // InternalMenuDsl.g:808:6: lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard
+                    // InternalMenuDsl.g:907:5: (lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard )
+                    // InternalMenuDsl.g:908:6: lv_importedNamespace_8_0= ruleQualifiedNameWithWildcard
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_2_2_0());
                       					
                     }
-                    pushFollow(FOLLOW_21);
+                    pushFollow(FOLLOW_22);
                     lv_importedNamespace_8_0=ruleQualifiedNameWithWildcard();
 
                     state._fsp--;
@@ -2165,18 +2450,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:826:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
+                    // InternalMenuDsl.g:926:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
                     {
-                    // InternalMenuDsl.g:826:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
-                    // InternalMenuDsl.g:827:5: ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
+                    // InternalMenuDsl.g:926:4: ( ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) ) )
+                    // InternalMenuDsl.g:927:5: ( (lv_fqnImport_9_0= 'ns' ) ) ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
                     {
-                    // InternalMenuDsl.g:827:5: ( (lv_fqnImport_9_0= 'ns' ) )
-                    // InternalMenuDsl.g:828:6: (lv_fqnImport_9_0= 'ns' )
+                    // InternalMenuDsl.g:927:5: ( (lv_fqnImport_9_0= 'ns' ) )
+                    // InternalMenuDsl.g:928:6: (lv_fqnImport_9_0= 'ns' )
                     {
-                    // InternalMenuDsl.g:828:6: (lv_fqnImport_9_0= 'ns' )
-                    // InternalMenuDsl.g:829:7: lv_fqnImport_9_0= 'ns'
+                    // InternalMenuDsl.g:928:6: (lv_fqnImport_9_0= 'ns' )
+                    // InternalMenuDsl.g:929:7: lv_fqnImport_9_0= 'ns'
                     {
-                    lv_fqnImport_9_0=(Token)match(input,36,FOLLOW_4); if (state.failed) return current;
+                    lv_fqnImport_9_0=(Token)match(input,38,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(lv_fqnImport_9_0, grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0());
@@ -2196,18 +2481,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:841:5: ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
-                    // InternalMenuDsl.g:842:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
+                    // InternalMenuDsl.g:941:5: ( (lv_importedFullyQualifiedName_10_0= ruleQualifiedName ) )
+                    // InternalMenuDsl.g:942:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
                     {
-                    // InternalMenuDsl.g:842:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
-                    // InternalMenuDsl.g:843:7: lv_importedFullyQualifiedName_10_0= ruleQualifiedName
+                    // InternalMenuDsl.g:942:6: (lv_importedFullyQualifiedName_10_0= ruleQualifiedName )
+                    // InternalMenuDsl.g:943:7: lv_importedFullyQualifiedName_10_0= ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedFullyQualifiedNameQualifiedNameParserRuleCall_2_3_1_0());
                       						
                     }
-                    pushFollow(FOLLOW_21);
+                    pushFollow(FOLLOW_22);
                     lv_importedFullyQualifiedName_10_0=ruleQualifiedName();
 
                     state._fsp--;
@@ -2240,18 +2525,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:862:3: (otherlv_11= ';' )?
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // InternalMenuDsl.g:962:3: (otherlv_11= ';' )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
 
-            if ( (LA18_0==37) ) {
-                alt18=1;
+            if ( (LA16_0==39) ) {
+                alt16=1;
             }
-            switch (alt18) {
+            switch (alt16) {
                 case 1 :
-                    // InternalMenuDsl.g:863:4: otherlv_11= ';'
+                    // InternalMenuDsl.g:963:4: otherlv_11= ';'
                     {
-                    otherlv_11=(Token)match(input,37,FOLLOW_2); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,39,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_11, grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_3());
@@ -2288,7 +2573,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // InternalMenuDsl.g:872:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
+    // InternalMenuDsl.g:972:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
     public final EObject entryRuleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -2296,8 +2581,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:872:52: (iv_ruleXAnnotation= ruleXAnnotation EOF )
-            // InternalMenuDsl.g:873:2: iv_ruleXAnnotation= ruleXAnnotation EOF
+            // InternalMenuDsl.g:972:52: (iv_ruleXAnnotation= ruleXAnnotation EOF )
+            // InternalMenuDsl.g:973:2: iv_ruleXAnnotation= ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationRule()); 
@@ -2328,7 +2613,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // InternalMenuDsl.g:879: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= ')' )? ) ;
+    // InternalMenuDsl.g:979: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;
 
@@ -2347,14 +2632,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:885: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= ')' )? ) )
-            // InternalMenuDsl.g:886: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= ')' )? )
+            // InternalMenuDsl.g:985: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= ')' )? ) )
+            // InternalMenuDsl.g:986: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= ')' )? )
             {
-            // InternalMenuDsl.g:886: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= ')' )? )
-            // InternalMenuDsl.g:887: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= ')' )?
+            // InternalMenuDsl.g:986: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= ')' )? )
+            // InternalMenuDsl.g:987: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= ')' )?
             {
-            // InternalMenuDsl.g:887:3: ()
-            // InternalMenuDsl.g:888:4: 
+            // InternalMenuDsl.g:987:3: ()
+            // InternalMenuDsl.g:988:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -2366,17 +2651,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,38,FOLLOW_4); if (state.failed) return current;
+            otherlv_1=(Token)match(input,40,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1());
               		
             }
-            // InternalMenuDsl.g:898:3: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:899:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:998:3: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:999:4: ( ruleQualifiedName )
             {
-            // InternalMenuDsl.g:899:4: ( ruleQualifiedName )
-            // InternalMenuDsl.g:900:5: ruleQualifiedName
+            // InternalMenuDsl.g:999:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:1000:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -2390,7 +2675,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               					newCompositeNode(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0());
               				
             }
-            pushFollow(FOLLOW_22);
+            pushFollow(FOLLOW_23);
             ruleQualifiedName();
 
             state._fsp--;
@@ -2406,21 +2691,21 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:914: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 alt21=2;
-            int LA21_0 = input.LA(1);
+            // InternalMenuDsl.g:1014: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 alt19=2;
+            int LA19_0 = input.LA(1);
 
-            if ( (LA21_0==39) && (synpred1_InternalMenuDsl())) {
-                alt21=1;
+            if ( (LA19_0==41) && (synpred1_InternalMenuDsl())) {
+                alt19=1;
             }
-            switch (alt21) {
+            switch (alt19) {
                 case 1 :
-                    // InternalMenuDsl.g:915:4: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
+                    // InternalMenuDsl.g:1015:4: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
                     {
-                    // InternalMenuDsl.g:915:4: ( ( '(' )=>otherlv_3= '(' )
-                    // InternalMenuDsl.g:916:5: ( '(' )=>otherlv_3= '('
+                    // InternalMenuDsl.g:1015:4: ( ( '(' )=>otherlv_3= '(' )
+                    // InternalMenuDsl.g:1016:5: ( '(' )=>otherlv_3= '('
                     {
-                    otherlv_3=(Token)match(input,39,FOLLOW_23); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,41,FOLLOW_24); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_3, grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0());
@@ -2429,28 +2714,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:922:4: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
-                    int alt20=3;
-                    alt20 = dfa20.predict(input);
-                    switch (alt20) {
+                    // InternalMenuDsl.g:1022:4: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
+                    int alt18=3;
+                    alt18 = dfa18.predict(input);
+                    switch (alt18) {
                         case 1 :
-                            // InternalMenuDsl.g:923:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalMenuDsl.g:1023:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
                             {
-                            // InternalMenuDsl.g:923:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
-                            // InternalMenuDsl.g:924:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            // InternalMenuDsl.g:1023:5: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalMenuDsl.g:1024:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
                             {
-                            // InternalMenuDsl.g:924:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
-                            // InternalMenuDsl.g:925:7: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalMenuDsl.g:1024:6: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
+                            // InternalMenuDsl.g:1025:7: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
                             {
-                            // InternalMenuDsl.g:934:7: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
-                            // InternalMenuDsl.g:935:8: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
+                            // InternalMenuDsl.g:1034:7: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalMenuDsl.g:1035:8: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0());
                               							
                             }
-                            pushFollow(FOLLOW_24);
+                            pushFollow(FOLLOW_25);
                             lv_elementValuePairs_4_0=ruleXAnnotationElementValuePair();
 
                             state._fsp--;
@@ -2474,39 +2759,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:952:6: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
-                            loop19:
+                            // InternalMenuDsl.g:1052:6: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            loop17:
                             do {
-                                int alt19=2;
-                                int LA19_0 = input.LA(1);
+                                int alt17=2;
+                                int LA17_0 = input.LA(1);
 
-                                if ( (LA19_0==40) ) {
-                                    alt19=1;
+                                if ( (LA17_0==42) ) {
+                                    alt17=1;
                                 }
 
 
-                                switch (alt19) {
+                                switch (alt17) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:953:7: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalMenuDsl.g:1053:7: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
                             	    {
-                            	    otherlv_5=(Token)match(input,40,FOLLOW_4); if (state.failed) return current;
+                            	    otherlv_5=(Token)match(input,42,FOLLOW_4); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_5, grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0());
                             	      						
                             	    }
-                            	    // InternalMenuDsl.g:957:7: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
-                            	    // InternalMenuDsl.g:958:8: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalMenuDsl.g:1057:7: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalMenuDsl.g:1058:8: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
                             	    {
-                            	    // InternalMenuDsl.g:967:8: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
-                            	    // InternalMenuDsl.g:968:9: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
+                            	    // InternalMenuDsl.g:1067:8: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalMenuDsl.g:1068:9: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      									newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0());
                             	      								
                             	    }
-                            	    pushFollow(FOLLOW_24);
+                            	    pushFollow(FOLLOW_25);
                             	    lv_elementValuePairs_6_0=ruleXAnnotationElementValuePair();
 
                             	    state._fsp--;
@@ -2535,7 +2820,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop19;
+                            	    break loop17;
                                 }
                             } while (true);
 
@@ -2546,20 +2831,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:988:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalMenuDsl.g:1088:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
                             {
-                            // InternalMenuDsl.g:988:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
-                            // InternalMenuDsl.g:989:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalMenuDsl.g:1088:5: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalMenuDsl.g:1089:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
                             {
-                            // InternalMenuDsl.g:989:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
-                            // InternalMenuDsl.g:990:7: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
+                            // InternalMenuDsl.g:1089:6: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalMenuDsl.g:1090:7: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0());
                               						
                             }
-                            pushFollow(FOLLOW_25);
+                            pushFollow(FOLLOW_26);
                             lv_value_7_0=ruleXAnnotationElementValueOrCommaList();
 
                             state._fsp--;
@@ -2589,7 +2874,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_8=(Token)match(input,41,FOLLOW_2); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_8, grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2());
@@ -2626,7 +2911,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // InternalMenuDsl.g:1017:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
+    // InternalMenuDsl.g:1117:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
     public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -2634,8 +2919,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1017:68: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
-            // InternalMenuDsl.g:1018:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
+            // InternalMenuDsl.g:1117:68: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
+            // InternalMenuDsl.g:1118:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValuePairRule()); 
@@ -2666,7 +2951,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // InternalMenuDsl.g:1024:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
+    // InternalMenuDsl.g:1124:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
     public final EObject ruleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -2678,23 +2963,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1030:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
-            // InternalMenuDsl.g:1031:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalMenuDsl.g:1130:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
+            // InternalMenuDsl.g:1131:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
             {
-            // InternalMenuDsl.g:1031:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
-            // InternalMenuDsl.g:1032:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalMenuDsl.g:1131:2: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalMenuDsl.g:1132:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
             {
-            // InternalMenuDsl.g:1032:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
-            // InternalMenuDsl.g:1033:4: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalMenuDsl.g:1132:3: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
+            // InternalMenuDsl.g:1133:4: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
             {
-            // InternalMenuDsl.g:1042:4: ( ( ( ruleValidID ) ) otherlv_1= '=' )
-            // InternalMenuDsl.g:1043:5: ( ( ruleValidID ) ) otherlv_1= '='
+            // InternalMenuDsl.g:1142:4: ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalMenuDsl.g:1143:5: ( ( ruleValidID ) ) otherlv_1= '='
             {
-            // InternalMenuDsl.g:1043:5: ( ( ruleValidID ) )
-            // InternalMenuDsl.g:1044:6: ( ruleValidID )
+            // InternalMenuDsl.g:1143:5: ( ( ruleValidID ) )
+            // InternalMenuDsl.g:1144:6: ( ruleValidID )
             {
-            // InternalMenuDsl.g:1044:6: ( ruleValidID )
-            // InternalMenuDsl.g:1045:7: ruleValidID
+            // InternalMenuDsl.g:1144:6: ( ruleValidID )
+            // InternalMenuDsl.g:1145:7: ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -2708,7 +2993,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               							newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0());
               						
             }
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_27);
             ruleValidID();
 
             state._fsp--;
@@ -2724,7 +3009,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,42,FOLLOW_27); if (state.failed) return current;
+            otherlv_1=(Token)match(input,44,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1());
@@ -2736,11 +3021,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:1065:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
-            // InternalMenuDsl.g:1066:4: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalMenuDsl.g:1165:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalMenuDsl.g:1166:4: (lv_value_2_0= ruleXAnnotationElementValue )
             {
-            // InternalMenuDsl.g:1066:4: (lv_value_2_0= ruleXAnnotationElementValue )
-            // InternalMenuDsl.g:1067:5: lv_value_2_0= ruleXAnnotationElementValue
+            // InternalMenuDsl.g:1166:4: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalMenuDsl.g:1167:5: lv_value_2_0= ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
 
@@ -2796,7 +3081,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // InternalMenuDsl.g:1088:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
+    // InternalMenuDsl.g:1188:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
     public final EObject entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -2804,8 +3089,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1088:75: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
-            // InternalMenuDsl.g:1089:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
+            // InternalMenuDsl.g:1188:75: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
+            // InternalMenuDsl.g:1189:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
@@ -2836,7 +3121,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // InternalMenuDsl.g:1095: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 ) ) )+ )? ) ) ;
+    // InternalMenuDsl.g:1195: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;
 
@@ -2858,27 +3143,27 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1101: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 ) ) )+ )? ) ) )
-            // InternalMenuDsl.g:1102: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 ) ) )+ )? ) )
+            // InternalMenuDsl.g:1201: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 ) ) )+ )? ) ) )
+            // InternalMenuDsl.g:1202: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 ) ) )+ )? ) )
             {
-            // InternalMenuDsl.g:1102: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 alt26=2;
-            alt26 = dfa26.predict(input);
-            switch (alt26) {
+            // InternalMenuDsl.g:1202: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 alt24=2;
+            alt24 = dfa24.predict(input);
+            switch (alt24) {
                 case 1 :
-                    // InternalMenuDsl.g:1103:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalMenuDsl.g:1203:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // InternalMenuDsl.g:1103:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // InternalMenuDsl.g:1104:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalMenuDsl.g:1203:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalMenuDsl.g:1204:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // InternalMenuDsl.g:1104:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // InternalMenuDsl.g:1105:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalMenuDsl.g:1204:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalMenuDsl.g:1205:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // InternalMenuDsl.g:1112:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // InternalMenuDsl.g:1113:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalMenuDsl.g:1212:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalMenuDsl.g:1213:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // InternalMenuDsl.g:1113:6: ()
-                    // InternalMenuDsl.g:1114:7: 
+                    // InternalMenuDsl.g:1213:6: ()
+                    // InternalMenuDsl.g:1214:7: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2890,13 +3175,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,45,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1());
                       					
                     }
-                    otherlv_2=(Token)match(input,44,FOLLOW_29); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,46,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -2908,29 +3193,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:1130:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
-                    int alt23=2;
-                    int LA23_0 = input.LA(1);
+                    // InternalMenuDsl.g:1230:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    int alt21=2;
+                    int LA21_0 = input.LA(1);
 
-                    if ( ((LA23_0>=RULE_STRING && LA23_0<=RULE_DECIMAL)||LA23_0==14||(LA23_0>=32 && LA23_0<=34)||(LA23_0>=38 && LA23_0<=39)||(LA23_0>=43 && LA23_0<=44)||LA23_0==51||(LA23_0>=67 && LA23_0<=68)||LA23_0==72||LA23_0==80||LA23_0==82||(LA23_0>=86 && LA23_0<=88)||(LA23_0>=91 && LA23_0<=100)||LA23_0==102) ) {
-                        alt23=1;
+                    if ( ((LA21_0>=RULE_STRING && LA21_0<=RULE_DECIMAL)||LA21_0==26||(LA21_0>=34 && LA21_0<=36)||(LA21_0>=40 && LA21_0<=41)||(LA21_0>=45 && LA21_0<=46)||LA21_0==53||(LA21_0>=69 && LA21_0<=70)||LA21_0==74||LA21_0==82||LA21_0==84||(LA21_0>=88 && LA21_0<=90)||(LA21_0>=93 && LA21_0<=102)||LA21_0==104) ) {
+                        alt21=1;
                     }
-                    switch (alt23) {
+                    switch (alt21) {
                         case 1 :
-                            // InternalMenuDsl.g:1131:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalMenuDsl.g:1231:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // InternalMenuDsl.g:1131:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // InternalMenuDsl.g:1132:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalMenuDsl.g:1231:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalMenuDsl.g:1232:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // InternalMenuDsl.g:1132:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // InternalMenuDsl.g:1133:7: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalMenuDsl.g:1232:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalMenuDsl.g:1233:7: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_30);
+                            pushFollow(FOLLOW_31);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -2954,39 +3239,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:1150:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
-                            loop22:
+                            // InternalMenuDsl.g:1250:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            loop20:
                             do {
-                                int alt22=2;
-                                int LA22_0 = input.LA(1);
+                                int alt20=2;
+                                int LA20_0 = input.LA(1);
 
-                                if ( (LA22_0==40) ) {
-                                    alt22=1;
+                                if ( (LA20_0==42) ) {
+                                    alt20=1;
                                 }
 
 
-                                switch (alt22) {
+                                switch (alt20) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:1151:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalMenuDsl.g:1251:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0());
                             	      					
                             	    }
-                            	    // InternalMenuDsl.g:1155:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // InternalMenuDsl.g:1156:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalMenuDsl.g:1255:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalMenuDsl.g:1256:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // InternalMenuDsl.g:1156:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // InternalMenuDsl.g:1157:8: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalMenuDsl.g:1256:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalMenuDsl.g:1257:8: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_30);
+                            	    pushFollow(FOLLOW_31);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -3015,7 +3300,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop22;
+                            	    break loop20;
                                 }
                             } while (true);
 
@@ -3025,7 +3310,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_6=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2());
@@ -3038,17 +3323,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:1182:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalMenuDsl.g:1282:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
                     {
-                    // InternalMenuDsl.g:1182:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
-                    // InternalMenuDsl.g:1183:4: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    // InternalMenuDsl.g:1282:3: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalMenuDsl.g:1283:4: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
                     {
                     if ( state.backtracking==0 ) {
 
                       				newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0());
                       			
                     }
-                    pushFollow(FOLLOW_31);
+                    pushFollow(FOLLOW_32);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -3059,19 +3344,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalMenuDsl.g:1191:4: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
-                    int alt25=2;
-                    int LA25_0 = input.LA(1);
+                    // InternalMenuDsl.g:1291:4: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    int alt23=2;
+                    int LA23_0 = input.LA(1);
 
-                    if ( (LA25_0==40) ) {
-                        alt25=1;
+                    if ( (LA23_0==42) ) {
+                        alt23=1;
                     }
-                    switch (alt25) {
+                    switch (alt23) {
                         case 1 :
-                            // InternalMenuDsl.g:1192:5: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            // InternalMenuDsl.g:1292:5: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
                             {
-                            // InternalMenuDsl.g:1192:5: ()
-                            // InternalMenuDsl.g:1193:6: 
+                            // InternalMenuDsl.g:1292:5: ()
+                            // InternalMenuDsl.g:1293:6: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -3083,40 +3368,40 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:1199:5: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
-                            int cnt24=0;
-                            loop24:
+                            // InternalMenuDsl.g:1299:5: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            int cnt22=0;
+                            loop22:
                             do {
-                                int alt24=2;
-                                int LA24_0 = input.LA(1);
+                                int alt22=2;
+                                int LA22_0 = input.LA(1);
 
-                                if ( (LA24_0==40) ) {
-                                    alt24=1;
+                                if ( (LA22_0==42) ) {
+                                    alt22=1;
                                 }
 
 
-                                switch (alt24) {
+                                switch (alt22) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:1200:6: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalMenuDsl.g:1300:6: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_9=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                            	    otherlv_9=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_9, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0());
                             	      					
                             	    }
-                            	    // InternalMenuDsl.g:1204:6: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
-                            	    // InternalMenuDsl.g:1205:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalMenuDsl.g:1304:6: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalMenuDsl.g:1305:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // InternalMenuDsl.g:1205:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
-                            	    // InternalMenuDsl.g:1206:8: lv_elements_10_0= ruleXAnnotationOrExpression
+                            	    // InternalMenuDsl.g:1305:7: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalMenuDsl.g:1306:8: lv_elements_10_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_31);
+                            	    pushFollow(FOLLOW_32);
                             	    lv_elements_10_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -3145,13 +3430,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    if ( cnt24 >= 1 ) break loop24;
+                            	    if ( cnt22 >= 1 ) break loop22;
                             	    if (state.backtracking>0) {state.failed=true; return current;}
                                         EarlyExitException eee =
-                                            new EarlyExitException(24, input);
+                                            new EarlyExitException(22, input);
                                         throw eee;
                                 }
-                                cnt24++;
+                                cnt22++;
                             } while (true);
 
 
@@ -3191,7 +3476,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // InternalMenuDsl.g:1230:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
+    // InternalMenuDsl.g:1330:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
     public final EObject entryRuleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -3199,8 +3484,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1230:64: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
-            // InternalMenuDsl.g:1231:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
+            // InternalMenuDsl.g:1330:64: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
+            // InternalMenuDsl.g:1331:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueRule()); 
@@ -3231,7 +3516,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // InternalMenuDsl.g:1237: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 ) ;
+    // InternalMenuDsl.g:1337: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;
 
@@ -3250,27 +3535,27 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1243:2: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
-            // InternalMenuDsl.g:1244:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            // InternalMenuDsl.g:1343:2: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
+            // InternalMenuDsl.g:1344:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
             {
-            // InternalMenuDsl.g:1244:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
-            int alt29=2;
-            alt29 = dfa29.predict(input);
-            switch (alt29) {
+            // InternalMenuDsl.g:1344:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            int alt27=2;
+            alt27 = dfa27.predict(input);
+            switch (alt27) {
                 case 1 :
-                    // InternalMenuDsl.g:1245:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalMenuDsl.g:1345:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // InternalMenuDsl.g:1245:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // InternalMenuDsl.g:1246:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalMenuDsl.g:1345:3: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalMenuDsl.g:1346:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // InternalMenuDsl.g:1246:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // InternalMenuDsl.g:1247:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalMenuDsl.g:1346:4: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalMenuDsl.g:1347:5: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // InternalMenuDsl.g:1254:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // InternalMenuDsl.g:1255:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalMenuDsl.g:1354:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalMenuDsl.g:1355:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // InternalMenuDsl.g:1255:6: ()
-                    // InternalMenuDsl.g:1256:7: 
+                    // InternalMenuDsl.g:1355:6: ()
+                    // InternalMenuDsl.g:1356:7: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3282,13 +3567,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,45,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1());
                       					
                     }
-                    otherlv_2=(Token)match(input,44,FOLLOW_29); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,46,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -3300,29 +3585,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:1272:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
-                    int alt28=2;
-                    int LA28_0 = input.LA(1);
+                    // InternalMenuDsl.g:1372:4: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    int alt26=2;
+                    int LA26_0 = input.LA(1);
 
-                    if ( ((LA28_0>=RULE_STRING && LA28_0<=RULE_DECIMAL)||LA28_0==14||(LA28_0>=32 && LA28_0<=34)||(LA28_0>=38 && LA28_0<=39)||(LA28_0>=43 && LA28_0<=44)||LA28_0==51||(LA28_0>=67 && LA28_0<=68)||LA28_0==72||LA28_0==80||LA28_0==82||(LA28_0>=86 && LA28_0<=88)||(LA28_0>=91 && LA28_0<=100)||LA28_0==102) ) {
-                        alt28=1;
+                    if ( ((LA26_0>=RULE_STRING && LA26_0<=RULE_DECIMAL)||LA26_0==26||(LA26_0>=34 && LA26_0<=36)||(LA26_0>=40 && LA26_0<=41)||(LA26_0>=45 && LA26_0<=46)||LA26_0==53||(LA26_0>=69 && LA26_0<=70)||LA26_0==74||LA26_0==82||LA26_0==84||(LA26_0>=88 && LA26_0<=90)||(LA26_0>=93 && LA26_0<=102)||LA26_0==104) ) {
+                        alt26=1;
                     }
-                    switch (alt28) {
+                    switch (alt26) {
                         case 1 :
-                            // InternalMenuDsl.g:1273:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalMenuDsl.g:1373:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // InternalMenuDsl.g:1273:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // InternalMenuDsl.g:1274:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalMenuDsl.g:1373:5: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalMenuDsl.g:1374:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // InternalMenuDsl.g:1274:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // InternalMenuDsl.g:1275:7: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalMenuDsl.g:1374:6: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalMenuDsl.g:1375:7: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_30);
+                            pushFollow(FOLLOW_31);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -3346,39 +3631,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:1292:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
-                            loop27:
+                            // InternalMenuDsl.g:1392:5: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            loop25:
                             do {
-                                int alt27=2;
-                                int LA27_0 = input.LA(1);
+                                int alt25=2;
+                                int LA25_0 = input.LA(1);
 
-                                if ( (LA27_0==40) ) {
-                                    alt27=1;
+                                if ( (LA25_0==42) ) {
+                                    alt25=1;
                                 }
 
 
-                                switch (alt27) {
+                                switch (alt25) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:1293:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalMenuDsl.g:1393:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0());
                             	      					
                             	    }
-                            	    // InternalMenuDsl.g:1297:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // InternalMenuDsl.g:1298:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalMenuDsl.g:1397:6: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalMenuDsl.g:1398:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // InternalMenuDsl.g:1298:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // InternalMenuDsl.g:1299:8: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalMenuDsl.g:1398:7: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalMenuDsl.g:1399:8: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_30);
+                            	    pushFollow(FOLLOW_31);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -3407,7 +3692,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop27;
+                            	    break loop25;
                                 }
                             } while (true);
 
@@ -3417,7 +3702,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_6=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2());
@@ -3430,7 +3715,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:1324:3: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
+                    // InternalMenuDsl.g:1424:3: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3476,7 +3761,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // InternalMenuDsl.g:1336:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
+    // InternalMenuDsl.g:1436:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
     public final EObject entryRuleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3484,8 +3769,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1336:64: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
-            // InternalMenuDsl.g:1337:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
+            // InternalMenuDsl.g:1436:64: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
+            // InternalMenuDsl.g:1437:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationOrExpressionRule()); 
@@ -3516,7 +3801,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // InternalMenuDsl.g:1343:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
+    // InternalMenuDsl.g:1443:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3529,29 +3814,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1349:2: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
-            // InternalMenuDsl.g:1350:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            // InternalMenuDsl.g:1449:2: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
+            // InternalMenuDsl.g:1450:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
             {
-            // InternalMenuDsl.g:1350:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
-            int alt30=2;
-            int LA30_0 = input.LA(1);
+            // InternalMenuDsl.g:1450:2: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-            if ( (LA30_0==38) ) {
-                alt30=1;
+            if ( (LA28_0==40) ) {
+                alt28=1;
             }
-            else if ( ((LA30_0>=RULE_STRING && LA30_0<=RULE_DECIMAL)||LA30_0==14||(LA30_0>=32 && LA30_0<=34)||LA30_0==39||(LA30_0>=43 && LA30_0<=44)||LA30_0==51||(LA30_0>=67 && LA30_0<=68)||LA30_0==72||LA30_0==80||LA30_0==82||(LA30_0>=86 && LA30_0<=88)||(LA30_0>=91 && LA30_0<=100)||LA30_0==102) ) {
-                alt30=2;
+            else if ( ((LA28_0>=RULE_STRING && LA28_0<=RULE_DECIMAL)||LA28_0==26||(LA28_0>=34 && LA28_0<=36)||LA28_0==41||(LA28_0>=45 && LA28_0<=46)||LA28_0==53||(LA28_0>=69 && LA28_0<=70)||LA28_0==74||LA28_0==82||LA28_0==84||(LA28_0>=88 && LA28_0<=90)||(LA28_0>=93 && LA28_0<=102)||LA28_0==104) ) {
+                alt28=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 30, 0, input);
+                    new NoViableAltException("", 28, 0, input);
 
                 throw nvae;
             }
-            switch (alt30) {
+            switch (alt28) {
                 case 1 :
-                    // InternalMenuDsl.g:1351:3: this_XAnnotation_0= ruleXAnnotation
+                    // InternalMenuDsl.g:1451:3: this_XAnnotation_0= ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3573,7 +3858,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:1360:3: this_XExpression_1= ruleXExpression
+                    // InternalMenuDsl.g:1460:3: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3619,7 +3904,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXExpression"
-    // InternalMenuDsl.g:1372:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
+    // InternalMenuDsl.g:1472:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
     public final EObject entryRuleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3627,8 +3912,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1372:52: (iv_ruleXExpression= ruleXExpression EOF )
-            // InternalMenuDsl.g:1373:2: iv_ruleXExpression= ruleXExpression EOF
+            // InternalMenuDsl.g:1472:52: (iv_ruleXExpression= ruleXExpression EOF )
+            // InternalMenuDsl.g:1473:2: iv_ruleXExpression= ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionRule()); 
@@ -3659,7 +3944,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXExpression"
-    // InternalMenuDsl.g:1379:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
+    // InternalMenuDsl.g:1479:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
     public final EObject ruleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3670,8 +3955,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1385:2: (this_XAssignment_0= ruleXAssignment )
-            // InternalMenuDsl.g:1386:2: this_XAssignment_0= ruleXAssignment
+            // InternalMenuDsl.g:1485:2: (this_XAssignment_0= ruleXAssignment )
+            // InternalMenuDsl.g:1486:2: this_XAssignment_0= ruleXAssignment
             {
             if ( state.backtracking==0 ) {
 
@@ -3711,7 +3996,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // InternalMenuDsl.g:1397:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
+    // InternalMenuDsl.g:1497:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
     public final EObject entryRuleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -3719,8 +4004,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1397:52: (iv_ruleXAssignment= ruleXAssignment EOF )
-            // InternalMenuDsl.g:1398:2: iv_ruleXAssignment= ruleXAssignment EOF
+            // InternalMenuDsl.g:1497:52: (iv_ruleXAssignment= ruleXAssignment EOF )
+            // InternalMenuDsl.g:1498:2: iv_ruleXAssignment= ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAssignmentRule()); 
@@ -3751,7 +4036,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAssignment"
-    // InternalMenuDsl.g:1404:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
+    // InternalMenuDsl.g:1504: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;
 
@@ -3766,102 +4051,102 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1410:2: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
-            // InternalMenuDsl.g:1411:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalMenuDsl.g:1510:2: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
+            // InternalMenuDsl.g:1511:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             {
-            // InternalMenuDsl.g:1411:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
-            int alt32=2;
+            // InternalMenuDsl.g:1511:2: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            int alt30=2;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                int LA32_1 = input.LA(2);
+                int LA30_1 = input.LA(2);
 
-                if ( (LA32_1==42) ) {
-                    alt32=1;
+                if ( (LA30_1==EOF||(LA30_1>=RULE_STRING && LA30_1<=RULE_DECIMAL)||(LA30_1>=26 && LA30_1<=27)||(LA30_1>=34 && LA30_1<=37)||LA30_1==39||(LA30_1>=41 && LA30_1<=43)||(LA30_1>=45 && LA30_1<=80)||(LA30_1>=82 && LA30_1<=105)) ) {
+                    alt30=2;
                 }
-                else if ( (LA32_1==EOF||(LA32_1>=RULE_STRING && LA32_1<=RULE_DECIMAL)||LA32_1==14||LA32_1==21||(LA32_1>=32 && LA32_1<=35)||LA32_1==37||(LA32_1>=39 && LA32_1<=41)||(LA32_1>=43 && LA32_1<=78)||(LA32_1>=80 && LA32_1<=103)) ) {
-                    alt32=2;
+                else if ( (LA30_1==44) ) {
+                    alt30=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 32, 1, input);
+                        new NoViableAltException("", 30, 1, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 91:
+            case 93:
                 {
-                int LA32_2 = input.LA(2);
+                int LA30_2 = input.LA(2);
 
-                if ( (LA32_2==42) ) {
-                    alt32=1;
+                if ( (LA30_2==EOF||(LA30_2>=RULE_STRING && LA30_2<=RULE_DECIMAL)||(LA30_2>=26 && LA30_2<=27)||(LA30_2>=34 && LA30_2<=37)||LA30_2==39||(LA30_2>=41 && LA30_2<=43)||(LA30_2>=45 && LA30_2<=80)||(LA30_2>=82 && LA30_2<=105)) ) {
+                    alt30=2;
                 }
-                else if ( (LA32_2==EOF||(LA32_2>=RULE_STRING && LA32_2<=RULE_DECIMAL)||LA32_2==14||LA32_2==21||(LA32_2>=32 && LA32_2<=35)||LA32_2==37||(LA32_2>=39 && LA32_2<=41)||(LA32_2>=43 && LA32_2<=78)||(LA32_2>=80 && LA32_2<=103)) ) {
-                    alt32=2;
+                else if ( (LA30_2==44) ) {
+                    alt30=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 32, 2, input);
+                        new NoViableAltException("", 30, 2, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 33:
+            case 35:
                 {
-                int LA32_3 = input.LA(2);
+                int LA30_3 = input.LA(2);
 
-                if ( (LA32_3==42) ) {
-                    alt32=1;
+                if ( (LA30_3==44) ) {
+                    alt30=1;
                 }
-                else if ( (LA32_3==EOF||(LA32_3>=RULE_STRING && LA32_3<=RULE_DECIMAL)||LA32_3==14||LA32_3==21||(LA32_3>=32 && LA32_3<=35)||LA32_3==37||(LA32_3>=39 && LA32_3<=41)||(LA32_3>=43 && LA32_3<=78)||(LA32_3>=80 && LA32_3<=103)) ) {
-                    alt32=2;
+                else if ( (LA30_3==EOF||(LA30_3>=RULE_STRING && LA30_3<=RULE_DECIMAL)||(LA30_3>=26 && LA30_3<=27)||(LA30_3>=34 && LA30_3<=37)||LA30_3==39||(LA30_3>=41 && LA30_3<=43)||(LA30_3>=45 && LA30_3<=80)||(LA30_3>=82 && LA30_3<=105)) ) {
+                    alt30=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 32, 3, input);
+                        new NoViableAltException("", 30, 3, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 32:
+            case 34:
                 {
-                int LA32_4 = input.LA(2);
+                int LA30_4 = input.LA(2);
 
-                if ( (LA32_4==42) ) {
-                    alt32=1;
+                if ( (LA30_4==44) ) {
+                    alt30=1;
                 }
-                else if ( (LA32_4==EOF||(LA32_4>=RULE_STRING && LA32_4<=RULE_DECIMAL)||LA32_4==14||LA32_4==21||(LA32_4>=32 && LA32_4<=35)||LA32_4==37||(LA32_4>=39 && LA32_4<=41)||(LA32_4>=43 && LA32_4<=78)||(LA32_4>=80 && LA32_4<=103)) ) {
-                    alt32=2;
+                else if ( (LA30_4==EOF||(LA30_4>=RULE_STRING && LA30_4<=RULE_DECIMAL)||(LA30_4>=26 && LA30_4<=27)||(LA30_4>=34 && LA30_4<=37)||LA30_4==39||(LA30_4>=41 && LA30_4<=43)||(LA30_4>=45 && LA30_4<=80)||(LA30_4>=82 && LA30_4<=105)) ) {
+                    alt30=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 32, 4, input);
+                        new NoViableAltException("", 30, 4, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 34:
+            case 36:
                 {
-                int LA32_5 = input.LA(2);
+                int LA30_5 = input.LA(2);
 
-                if ( (LA32_5==42) ) {
-                    alt32=1;
+                if ( (LA30_5==EOF||(LA30_5>=RULE_STRING && LA30_5<=RULE_DECIMAL)||(LA30_5>=26 && LA30_5<=27)||(LA30_5>=34 && LA30_5<=37)||LA30_5==39||(LA30_5>=41 && LA30_5<=43)||(LA30_5>=45 && LA30_5<=80)||(LA30_5>=82 && LA30_5<=105)) ) {
+                    alt30=2;
                 }
-                else if ( (LA32_5==EOF||(LA32_5>=RULE_STRING && LA32_5<=RULE_DECIMAL)||LA32_5==14||LA32_5==21||(LA32_5>=32 && LA32_5<=35)||LA32_5==37||(LA32_5>=39 && LA32_5<=41)||(LA32_5>=43 && LA32_5<=78)||(LA32_5>=80 && LA32_5<=103)) ) {
-                    alt32=2;
+                else if ( (LA30_5==44) ) {
+                    alt30=1;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 32, 5, input);
+                        new NoViableAltException("", 30, 5, input);
 
                     throw nvae;
                 }
@@ -3871,21 +4156,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             case RULE_HEX:
             case RULE_INT:
             case RULE_DECIMAL:
-            case 14:
-            case 39:
-            case 43:
-            case 44:
-            case 51:
-            case 67:
-            case 68:
-            case 72:
-            case 80:
+            case 26:
+            case 41:
+            case 45:
+            case 46:
+            case 53:
+            case 69:
+            case 70:
+            case 74:
             case 82:
-            case 86:
-            case 87:
+            case 84:
             case 88:
-            case 92:
-            case 93:
+            case 89:
+            case 90:
             case 94:
             case 95:
             case 96:
@@ -3893,28 +4176,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             case 98:
             case 99:
             case 100:
+            case 101:
             case 102:
+            case 104:
                 {
-                alt32=2;
+                alt30=2;
                 }
                 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 :
-                    // InternalMenuDsl.g:1412:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalMenuDsl.g:1512:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
                     {
-                    // InternalMenuDsl.g:1412:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
-                    // InternalMenuDsl.g:1413:4: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalMenuDsl.g:1512:3: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalMenuDsl.g:1513:4: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
                     {
-                    // InternalMenuDsl.g:1413:4: ()
-                    // InternalMenuDsl.g:1414:5: 
+                    // InternalMenuDsl.g:1513:4: ()
+                    // InternalMenuDsl.g:1514:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3926,11 +4211,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:1420:4: ( ( ruleFeatureCallID ) )
-                    // InternalMenuDsl.g:1421:5: ( ruleFeatureCallID )
+                    // InternalMenuDsl.g:1520:4: ( ( ruleFeatureCallID ) )
+                    // InternalMenuDsl.g:1521:5: ( ruleFeatureCallID )
                     {
-                    // InternalMenuDsl.g:1421:5: ( ruleFeatureCallID )
-                    // InternalMenuDsl.g:1422:6: ruleFeatureCallID
+                    // InternalMenuDsl.g:1521:5: ( ruleFeatureCallID )
+                    // InternalMenuDsl.g:1522:6: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3944,7 +4229,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       						newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_26);
+                    pushFollow(FOLLOW_27);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -3965,7 +4250,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       				newCompositeNode(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2());
                       			
                     }
-                    pushFollow(FOLLOW_27);
+                    pushFollow(FOLLOW_28);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -3975,11 +4260,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalMenuDsl.g:1443:4: ( (lv_value_3_0= ruleXAssignment ) )
-                    // InternalMenuDsl.g:1444:5: (lv_value_3_0= ruleXAssignment )
+                    // InternalMenuDsl.g:1543:4: ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalMenuDsl.g:1544:5: (lv_value_3_0= ruleXAssignment )
                     {
-                    // InternalMenuDsl.g:1444:5: (lv_value_3_0= ruleXAssignment )
-                    // InternalMenuDsl.g:1445:6: lv_value_3_0= ruleXAssignment
+                    // InternalMenuDsl.g:1544:5: (lv_value_3_0= ruleXAssignment )
+                    // InternalMenuDsl.g:1545:6: lv_value_3_0= ruleXAssignment
                     {
                     if ( state.backtracking==0 ) {
 
@@ -4017,17 +4302,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:1464:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalMenuDsl.g:1564:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
                     {
-                    // InternalMenuDsl.g:1464:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
-                    // InternalMenuDsl.g:1465:4: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalMenuDsl.g:1564:3: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalMenuDsl.g:1565:4: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     {
                     if ( state.backtracking==0 ) {
 
                       				newCompositeNode(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0());
                       			
                     }
-                    pushFollow(FOLLOW_32);
+                    pushFollow(FOLLOW_33);
                     this_XOrExpression_4=ruleXOrExpression();
 
                     state._fsp--;
@@ -4038,21 +4323,21 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalMenuDsl.g:1473:4: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
-                    int alt31=2;
-                    alt31 = dfa31.predict(input);
-                    switch (alt31) {
+                    // InternalMenuDsl.g:1573:4: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    int alt29=2;
+                    alt29 = dfa29.predict(input);
+                    switch (alt29) {
                         case 1 :
-                            // InternalMenuDsl.g:1474:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalMenuDsl.g:1574:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
                             {
-                            // InternalMenuDsl.g:1474:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
-                            // InternalMenuDsl.g:1475:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalMenuDsl.g:1574:5: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
+                            // InternalMenuDsl.g:1575:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
                             {
-                            // InternalMenuDsl.g:1485:6: ( () ( ( ruleOpMultiAssign ) ) )
-                            // InternalMenuDsl.g:1486:7: () ( ( ruleOpMultiAssign ) )
+                            // InternalMenuDsl.g:1585:6: ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalMenuDsl.g:1586:7: () ( ( ruleOpMultiAssign ) )
                             {
-                            // InternalMenuDsl.g:1486:7: ()
-                            // InternalMenuDsl.g:1487:8: 
+                            // InternalMenuDsl.g:1586:7: ()
+                            // InternalMenuDsl.g:1587:8: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -4064,11 +4349,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:1493:7: ( ( ruleOpMultiAssign ) )
-                            // InternalMenuDsl.g:1494:8: ( ruleOpMultiAssign )
+                            // InternalMenuDsl.g:1593:7: ( ( ruleOpMultiAssign ) )
+                            // InternalMenuDsl.g:1594:8: ( ruleOpMultiAssign )
                             {
-                            // InternalMenuDsl.g:1494:8: ( ruleOpMultiAssign )
-                            // InternalMenuDsl.g:1495:9: ruleOpMultiAssign
+                            // InternalMenuDsl.g:1594:8: ( ruleOpMultiAssign )
+                            // InternalMenuDsl.g:1595:9: ruleOpMultiAssign
                             {
                             if ( state.backtracking==0 ) {
 
@@ -4082,7 +4367,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                               									newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0());
                               								
                             }
-                            pushFollow(FOLLOW_27);
+                            pushFollow(FOLLOW_28);
                             ruleOpMultiAssign();
 
                             state._fsp--;
@@ -4104,11 +4389,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:1511:5: ( (lv_rightOperand_7_0= ruleXAssignment ) )
-                            // InternalMenuDsl.g:1512:6: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalMenuDsl.g:1611:5: ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalMenuDsl.g:1612:6: (lv_rightOperand_7_0= ruleXAssignment )
                             {
-                            // InternalMenuDsl.g:1512:6: (lv_rightOperand_7_0= ruleXAssignment )
-                            // InternalMenuDsl.g:1513:7: lv_rightOperand_7_0= ruleXAssignment
+                            // InternalMenuDsl.g:1612:6: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalMenuDsl.g:1613:7: lv_rightOperand_7_0= ruleXAssignment
                             {
                             if ( state.backtracking==0 ) {
 
@@ -4176,7 +4461,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // InternalMenuDsl.g:1536:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
+    // InternalMenuDsl.g:1636:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
     public final String entryRuleOpSingleAssign() throws RecognitionException {
         String current = null;
 
@@ -4184,8 +4469,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1536:54: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
-            // InternalMenuDsl.g:1537:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
+            // InternalMenuDsl.g:1636:54: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
+            // InternalMenuDsl.g:1637:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpSingleAssignRule()); 
@@ -4216,7 +4501,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // InternalMenuDsl.g:1543:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
+    // InternalMenuDsl.g:1643:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
     public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4226,10 +4511,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1549:2: (kw= '=' )
-            // InternalMenuDsl.g:1550:2: kw= '='
+            // InternalMenuDsl.g:1649:2: (kw= '=' )
+            // InternalMenuDsl.g:1650:2: kw= '='
             {
-            kw=(Token)match(input,42,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,44,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(kw);
@@ -4258,7 +4543,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // InternalMenuDsl.g:1558:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
+    // InternalMenuDsl.g:1658:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
     public final String entryRuleOpMultiAssign() throws RecognitionException {
         String current = null;
 
@@ -4266,8 +4551,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1558:53: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
-            // InternalMenuDsl.g:1559:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
+            // InternalMenuDsl.g:1658:53: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
+            // InternalMenuDsl.g:1659:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiAssignRule()); 
@@ -4298,7 +4583,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // InternalMenuDsl.g:1565:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
+    // InternalMenuDsl.g:1665: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();
 
@@ -4308,60 +4593,60 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1571:2: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
-            // InternalMenuDsl.g:1572:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalMenuDsl.g:1671:2: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
+            // InternalMenuDsl.g:1672:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             {
-            // InternalMenuDsl.g:1572:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
-            int alt34=7;
+            // InternalMenuDsl.g:1672:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            int alt32=7;
             switch ( input.LA(1) ) {
-            case 46:
+            case 48:
                 {
-                alt34=1;
+                alt32=1;
                 }
                 break;
-            case 47:
+            case 49:
                 {
-                alt34=2;
+                alt32=2;
                 }
                 break;
-            case 48:
+            case 50:
                 {
-                alt34=3;
+                alt32=3;
                 }
                 break;
-            case 49:
+            case 51:
                 {
-                alt34=4;
+                alt32=4;
                 }
                 break;
-            case 50:
+            case 52:
                 {
-                alt34=5;
+                alt32=5;
                 }
                 break;
-            case 51:
+            case 53:
                 {
-                alt34=6;
+                alt32=6;
                 }
                 break;
-            case 52:
+            case 54:
                 {
-                alt34=7;
+                alt32=7;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 34, 0, input);
+                    new NoViableAltException("", 32, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt34) {
+            switch (alt32) {
                 case 1 :
-                    // InternalMenuDsl.g:1573:3: kw= '+='
+                    // InternalMenuDsl.g:1673:3: kw= '+='
                     {
-                    kw=(Token)match(input,46,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,48,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -4372,9 +4657,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:1579:3: kw= '-='
+                    // InternalMenuDsl.g:1679:3: kw= '-='
                     {
-                    kw=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,49,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -4385,9 +4670,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:1585:3: kw= '*='
+                    // InternalMenuDsl.g:1685:3: kw= '*='
                     {
-                    kw=(Token)match(input,48,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,50,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -4398,9 +4683,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:1591:3: kw= '/='
+                    // InternalMenuDsl.g:1691:3: kw= '/='
                     {
-                    kw=(Token)match(input,49,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,51,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -4411,9 +4696,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:1597:3: kw= '%='
+                    // InternalMenuDsl.g:1697:3: kw= '%='
                     {
-                    kw=(Token)match(input,50,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,52,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -4424,26 +4709,26 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:1603:3: (kw= '<' kw= '<' kw= '=' )
+                    // InternalMenuDsl.g:1703:3: (kw= '<' kw= '<' kw= '=' )
                     {
-                    // InternalMenuDsl.g:1603:3: (kw= '<' kw= '<' kw= '=' )
-                    // InternalMenuDsl.g:1604:4: kw= '<' kw= '<' kw= '='
+                    // InternalMenuDsl.g:1703:3: (kw= '<' kw= '<' kw= '=' )
+                    // InternalMenuDsl.g:1704:4: kw= '<' kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,51,FOLLOW_33); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_34); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0());
                       			
                     }
-                    kw=(Token)match(input,51,FOLLOW_26); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_27); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1());
                       			
                     }
-                    kw=(Token)match(input,42,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,44,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -4457,30 +4742,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:1621:3: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalMenuDsl.g:1721:3: (kw= '>' (kw= '>' )? kw= '>=' )
                     {
-                    // InternalMenuDsl.g:1621:3: (kw= '>' (kw= '>' )? kw= '>=' )
-                    // InternalMenuDsl.g:1622:4: kw= '>' (kw= '>' )? kw= '>='
+                    // InternalMenuDsl.g:1721:3: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalMenuDsl.g:1722:4: kw= '>' (kw= '>' )? kw= '>='
                     {
-                    kw=(Token)match(input,52,FOLLOW_34); if (state.failed) return current;
+                    kw=(Token)match(input,54,FOLLOW_35); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0());
                       			
                     }
-                    // InternalMenuDsl.g:1627:4: (kw= '>' )?
-                    int alt33=2;
-                    int LA33_0 = input.LA(1);
+                    // InternalMenuDsl.g:1727:4: (kw= '>' )?
+                    int alt31=2;
+                    int LA31_0 = input.LA(1);
 
-                    if ( (LA33_0==52) ) {
-                        alt33=1;
+                    if ( (LA31_0==54) ) {
+                        alt31=1;
                     }
-                    switch (alt33) {
+                    switch (alt31) {
                         case 1 :
-                            // InternalMenuDsl.g:1628:5: kw= '>'
+                            // InternalMenuDsl.g:1728:5: kw= '>'
                             {
-                            kw=(Token)match(input,52,FOLLOW_35); if (state.failed) return current;
+                            kw=(Token)match(input,54,FOLLOW_36); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -4493,7 +4778,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,55,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -4531,7 +4816,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // InternalMenuDsl.g:1644:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
+    // InternalMenuDsl.g:1744:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
     public final EObject entryRuleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4539,8 +4824,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1644:54: (iv_ruleXOrExpression= ruleXOrExpression EOF )
-            // InternalMenuDsl.g:1645:2: iv_ruleXOrExpression= ruleXOrExpression EOF
+            // InternalMenuDsl.g:1744:54: (iv_ruleXOrExpression= ruleXOrExpression EOF )
+            // InternalMenuDsl.g:1745:2: iv_ruleXOrExpression= ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOrExpressionRule()); 
@@ -4571,7 +4856,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // InternalMenuDsl.g:1651:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
+    // InternalMenuDsl.g:1751: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;
 
@@ -4584,18 +4869,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1657:2: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
-            // InternalMenuDsl.g:1658:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalMenuDsl.g:1757:2: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
+            // InternalMenuDsl.g:1758:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
             {
-            // InternalMenuDsl.g:1658:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
-            // InternalMenuDsl.g:1659:3: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalMenuDsl.g:1758:2: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalMenuDsl.g:1759:3: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_36);
+            pushFollow(FOLLOW_37);
             this_XAndExpression_0=ruleXAndExpression();
 
             state._fsp--;
@@ -4606,35 +4891,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:1667:3: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
-            loop35:
+            // InternalMenuDsl.g:1767:3: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            loop33:
             do {
-                int alt35=2;
-                int LA35_0 = input.LA(1);
+                int alt33=2;
+                int LA33_0 = input.LA(1);
 
-                if ( (LA35_0==54) ) {
-                    int LA35_2 = input.LA(2);
+                if ( (LA33_0==56) ) {
+                    int LA33_2 = input.LA(2);
 
                     if ( (synpred8_InternalMenuDsl()) ) {
-                        alt35=1;
+                        alt33=1;
                     }
 
 
                 }
 
 
-                switch (alt35) {
+                switch (alt33) {
             	case 1 :
-            	    // InternalMenuDsl.g:1668:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalMenuDsl.g:1768:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
             	    {
-            	    // InternalMenuDsl.g:1668:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
-            	    // InternalMenuDsl.g:1669:5: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
+            	    // InternalMenuDsl.g:1768:4: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
+            	    // InternalMenuDsl.g:1769:5: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
             	    {
-            	    // InternalMenuDsl.g:1679:5: ( () ( ( ruleOpOr ) ) )
-            	    // InternalMenuDsl.g:1680:6: () ( ( ruleOpOr ) )
+            	    // InternalMenuDsl.g:1779:5: ( () ( ( ruleOpOr ) ) )
+            	    // InternalMenuDsl.g:1780:6: () ( ( ruleOpOr ) )
             	    {
-            	    // InternalMenuDsl.g:1680:6: ()
-            	    // InternalMenuDsl.g:1681:7: 
+            	    // InternalMenuDsl.g:1780:6: ()
+            	    // InternalMenuDsl.g:1781:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4646,11 +4931,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:1687:6: ( ( ruleOpOr ) )
-            	    // InternalMenuDsl.g:1688:7: ( ruleOpOr )
+            	    // InternalMenuDsl.g:1787:6: ( ( ruleOpOr ) )
+            	    // InternalMenuDsl.g:1788:7: ( ruleOpOr )
             	    {
-            	    // InternalMenuDsl.g:1688:7: ( ruleOpOr )
-            	    // InternalMenuDsl.g:1689:8: ruleOpOr
+            	    // InternalMenuDsl.g:1788:7: ( ruleOpOr )
+            	    // InternalMenuDsl.g:1789:8: ruleOpOr
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4664,7 +4949,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpOr();
 
             	    state._fsp--;
@@ -4686,18 +4971,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:1705:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
-            	    // InternalMenuDsl.g:1706:5: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalMenuDsl.g:1805:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalMenuDsl.g:1806:5: (lv_rightOperand_3_0= ruleXAndExpression )
             	    {
-            	    // InternalMenuDsl.g:1706:5: (lv_rightOperand_3_0= ruleXAndExpression )
-            	    // InternalMenuDsl.g:1707:6: lv_rightOperand_3_0= ruleXAndExpression
+            	    // InternalMenuDsl.g:1806:5: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalMenuDsl.g:1807:6: lv_rightOperand_3_0= ruleXAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_36);
+            	    pushFollow(FOLLOW_37);
             	    lv_rightOperand_3_0=ruleXAndExpression();
 
             	    state._fsp--;
@@ -4726,7 +5011,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop35;
+            	    break loop33;
                 }
             } while (true);
 
@@ -4755,7 +5040,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // InternalMenuDsl.g:1729:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
+    // InternalMenuDsl.g:1829:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
     public final String entryRuleOpOr() throws RecognitionException {
         String current = null;
 
@@ -4763,8 +5048,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1729:44: (iv_ruleOpOr= ruleOpOr EOF )
-            // InternalMenuDsl.g:1730:2: iv_ruleOpOr= ruleOpOr EOF
+            // InternalMenuDsl.g:1829:44: (iv_ruleOpOr= ruleOpOr EOF )
+            // InternalMenuDsl.g:1830:2: iv_ruleOpOr= ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOrRule()); 
@@ -4795,7 +5080,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpOr"
-    // InternalMenuDsl.g:1736:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
+    // InternalMenuDsl.g:1836:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
     public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4805,10 +5090,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1742:2: (kw= '||' )
-            // InternalMenuDsl.g:1743:2: kw= '||'
+            // InternalMenuDsl.g:1842:2: (kw= '||' )
+            // InternalMenuDsl.g:1843:2: kw= '||'
             {
-            kw=(Token)match(input,54,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,56,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(kw);
@@ -4837,7 +5122,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // InternalMenuDsl.g:1751:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
+    // InternalMenuDsl.g:1851:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
     public final EObject entryRuleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4845,8 +5130,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1751:55: (iv_ruleXAndExpression= ruleXAndExpression EOF )
-            // InternalMenuDsl.g:1752:2: iv_ruleXAndExpression= ruleXAndExpression EOF
+            // InternalMenuDsl.g:1851:55: (iv_ruleXAndExpression= ruleXAndExpression EOF )
+            // InternalMenuDsl.g:1852:2: iv_ruleXAndExpression= ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAndExpressionRule()); 
@@ -4877,7 +5162,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // InternalMenuDsl.g:1758:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
+    // InternalMenuDsl.g:1858: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;
 
@@ -4890,18 +5175,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1764:2: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
-            // InternalMenuDsl.g:1765:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalMenuDsl.g:1864:2: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
+            // InternalMenuDsl.g:1865:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
             {
-            // InternalMenuDsl.g:1765:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
-            // InternalMenuDsl.g:1766:3: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalMenuDsl.g:1865:2: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalMenuDsl.g:1866:3: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_37);
+            pushFollow(FOLLOW_38);
             this_XEqualityExpression_0=ruleXEqualityExpression();
 
             state._fsp--;
@@ -4912,35 +5197,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:1774:3: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
-            loop36:
+            // InternalMenuDsl.g:1874:3: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            loop34:
             do {
-                int alt36=2;
-                int LA36_0 = input.LA(1);
+                int alt34=2;
+                int LA34_0 = input.LA(1);
 
-                if ( (LA36_0==55) ) {
-                    int LA36_2 = input.LA(2);
+                if ( (LA34_0==57) ) {
+                    int LA34_2 = input.LA(2);
 
                     if ( (synpred9_InternalMenuDsl()) ) {
-                        alt36=1;
+                        alt34=1;
                     }
 
 
                 }
 
 
-                switch (alt36) {
+                switch (alt34) {
             	case 1 :
-            	    // InternalMenuDsl.g:1775:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalMenuDsl.g:1875:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
             	    {
-            	    // InternalMenuDsl.g:1775:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
-            	    // InternalMenuDsl.g:1776:5: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
+            	    // InternalMenuDsl.g:1875:4: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
+            	    // InternalMenuDsl.g:1876:5: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
             	    {
-            	    // InternalMenuDsl.g:1786:5: ( () ( ( ruleOpAnd ) ) )
-            	    // InternalMenuDsl.g:1787:6: () ( ( ruleOpAnd ) )
+            	    // InternalMenuDsl.g:1886:5: ( () ( ( ruleOpAnd ) ) )
+            	    // InternalMenuDsl.g:1887:6: () ( ( ruleOpAnd ) )
             	    {
-            	    // InternalMenuDsl.g:1787:6: ()
-            	    // InternalMenuDsl.g:1788:7: 
+            	    // InternalMenuDsl.g:1887:6: ()
+            	    // InternalMenuDsl.g:1888:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4952,11 +5237,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:1794:6: ( ( ruleOpAnd ) )
-            	    // InternalMenuDsl.g:1795:7: ( ruleOpAnd )
+            	    // InternalMenuDsl.g:1894:6: ( ( ruleOpAnd ) )
+            	    // InternalMenuDsl.g:1895:7: ( ruleOpAnd )
             	    {
-            	    // InternalMenuDsl.g:1795:7: ( ruleOpAnd )
-            	    // InternalMenuDsl.g:1796:8: ruleOpAnd
+            	    // InternalMenuDsl.g:1895:7: ( ruleOpAnd )
+            	    // InternalMenuDsl.g:1896:8: ruleOpAnd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4970,7 +5255,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpAnd();
 
             	    state._fsp--;
@@ -4992,18 +5277,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:1812:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
-            	    // InternalMenuDsl.g:1813:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalMenuDsl.g:1912:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalMenuDsl.g:1913:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
             	    {
-            	    // InternalMenuDsl.g:1813:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
-            	    // InternalMenuDsl.g:1814:6: lv_rightOperand_3_0= ruleXEqualityExpression
+            	    // InternalMenuDsl.g:1913:5: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalMenuDsl.g:1914:6: lv_rightOperand_3_0= ruleXEqualityExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_37);
+            	    pushFollow(FOLLOW_38);
             	    lv_rightOperand_3_0=ruleXEqualityExpression();
 
             	    state._fsp--;
@@ -5032,7 +5317,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop36;
+            	    break loop34;
                 }
             } while (true);
 
@@ -5061,7 +5346,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // InternalMenuDsl.g:1836:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
+    // InternalMenuDsl.g:1936:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
     public final String entryRuleOpAnd() throws RecognitionException {
         String current = null;
 
@@ -5069,8 +5354,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1836:45: (iv_ruleOpAnd= ruleOpAnd EOF )
-            // InternalMenuDsl.g:1837:2: iv_ruleOpAnd= ruleOpAnd EOF
+            // InternalMenuDsl.g:1936:45: (iv_ruleOpAnd= ruleOpAnd EOF )
+            // InternalMenuDsl.g:1937:2: iv_ruleOpAnd= ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAndRule()); 
@@ -5101,7 +5386,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpAnd"
-    // InternalMenuDsl.g:1843:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
+    // InternalMenuDsl.g:1943:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
     public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5111,10 +5396,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1849:2: (kw= '&&' )
-            // InternalMenuDsl.g:1850:2: kw= '&&'
+            // InternalMenuDsl.g:1949:2: (kw= '&&' )
+            // InternalMenuDsl.g:1950:2: kw= '&&'
             {
-            kw=(Token)match(input,55,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,57,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(kw);
@@ -5143,7 +5428,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // InternalMenuDsl.g:1858:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
+    // InternalMenuDsl.g:1958:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
     public final EObject entryRuleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5151,8 +5436,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1858:60: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
-            // InternalMenuDsl.g:1859:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
+            // InternalMenuDsl.g:1958:60: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
+            // InternalMenuDsl.g:1959:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXEqualityExpressionRule()); 
@@ -5183,7 +5468,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // InternalMenuDsl.g:1865:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
+    // InternalMenuDsl.g:1965: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;
 
@@ -5196,18 +5481,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1871:2: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
-            // InternalMenuDsl.g:1872:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalMenuDsl.g:1971:2: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
+            // InternalMenuDsl.g:1972:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
             {
-            // InternalMenuDsl.g:1872:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
-            // InternalMenuDsl.g:1873:3: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalMenuDsl.g:1972:2: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalMenuDsl.g:1973:3: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_38);
+            pushFollow(FOLLOW_39);
             this_XRelationalExpression_0=ruleXRelationalExpression();
 
             state._fsp--;
@@ -5218,50 +5503,50 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:1881:3: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
-            loop37:
+            // InternalMenuDsl.g:1981:3: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            loop35:
             do {
-                int alt37=2;
+                int alt35=2;
                 switch ( input.LA(1) ) {
-                case 56:
+                case 58:
                     {
-                    int LA37_2 = input.LA(2);
+                    int LA35_2 = input.LA(2);
 
                     if ( (synpred10_InternalMenuDsl()) ) {
-                        alt37=1;
+                        alt35=1;
                     }
 
 
                     }
                     break;
-                case 57:
+                case 59:
                     {
-                    int LA37_3 = input.LA(2);
+                    int LA35_3 = input.LA(2);
 
                     if ( (synpred10_InternalMenuDsl()) ) {
-                        alt37=1;
+                        alt35=1;
                     }
 
 
                     }
                     break;
-                case 58:
+                case 60:
                     {
-                    int LA37_4 = input.LA(2);
+                    int LA35_4 = input.LA(2);
 
                     if ( (synpred10_InternalMenuDsl()) ) {
-                        alt37=1;
+                        alt35=1;
                     }
 
 
                     }
                     break;
-                case 59:
+                case 61:
                     {
-                    int LA37_5 = input.LA(2);
+                    int LA35_5 = input.LA(2);
 
                     if ( (synpred10_InternalMenuDsl()) ) {
-                        alt37=1;
+                        alt35=1;
                     }
 
 
@@ -5270,18 +5555,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt37) {
+                switch (alt35) {
             	case 1 :
-            	    // InternalMenuDsl.g:1882:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalMenuDsl.g:1982:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
             	    {
-            	    // InternalMenuDsl.g:1882:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
-            	    // InternalMenuDsl.g:1883:5: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
+            	    // InternalMenuDsl.g:1982:4: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
+            	    // InternalMenuDsl.g:1983:5: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
             	    {
-            	    // InternalMenuDsl.g:1893:5: ( () ( ( ruleOpEquality ) ) )
-            	    // InternalMenuDsl.g:1894:6: () ( ( ruleOpEquality ) )
+            	    // InternalMenuDsl.g:1993:5: ( () ( ( ruleOpEquality ) ) )
+            	    // InternalMenuDsl.g:1994:6: () ( ( ruleOpEquality ) )
             	    {
-            	    // InternalMenuDsl.g:1894:6: ()
-            	    // InternalMenuDsl.g:1895:7: 
+            	    // InternalMenuDsl.g:1994:6: ()
+            	    // InternalMenuDsl.g:1995:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5293,11 +5578,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:1901:6: ( ( ruleOpEquality ) )
-            	    // InternalMenuDsl.g:1902:7: ( ruleOpEquality )
+            	    // InternalMenuDsl.g:2001:6: ( ( ruleOpEquality ) )
+            	    // InternalMenuDsl.g:2002:7: ( ruleOpEquality )
             	    {
-            	    // InternalMenuDsl.g:1902:7: ( ruleOpEquality )
-            	    // InternalMenuDsl.g:1903:8: ruleOpEquality
+            	    // InternalMenuDsl.g:2002:7: ( ruleOpEquality )
+            	    // InternalMenuDsl.g:2003:8: ruleOpEquality
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5311,7 +5596,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpEquality();
 
             	    state._fsp--;
@@ -5333,18 +5618,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:1919:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
-            	    // InternalMenuDsl.g:1920:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalMenuDsl.g:2019:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalMenuDsl.g:2020:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
             	    {
-            	    // InternalMenuDsl.g:1920:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
-            	    // InternalMenuDsl.g:1921:6: lv_rightOperand_3_0= ruleXRelationalExpression
+            	    // InternalMenuDsl.g:2020:5: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalMenuDsl.g:2021:6: lv_rightOperand_3_0= ruleXRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_38);
+            	    pushFollow(FOLLOW_39);
             	    lv_rightOperand_3_0=ruleXRelationalExpression();
 
             	    state._fsp--;
@@ -5373,7 +5658,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop37;
+            	    break loop35;
                 }
             } while (true);
 
@@ -5402,7 +5687,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // InternalMenuDsl.g:1943:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
+    // InternalMenuDsl.g:2043:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
     public final String entryRuleOpEquality() throws RecognitionException {
         String current = null;
 
@@ -5410,8 +5695,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1943:50: (iv_ruleOpEquality= ruleOpEquality EOF )
-            // InternalMenuDsl.g:1944:2: iv_ruleOpEquality= ruleOpEquality EOF
+            // InternalMenuDsl.g:2043:50: (iv_ruleOpEquality= ruleOpEquality EOF )
+            // InternalMenuDsl.g:2044:2: iv_ruleOpEquality= ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpEqualityRule()); 
@@ -5442,7 +5727,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpEquality"
-    // InternalMenuDsl.g:1950:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
+    // InternalMenuDsl.g:2050:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
     public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5452,45 +5737,45 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1956:2: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
-            // InternalMenuDsl.g:1957:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalMenuDsl.g:2056:2: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
+            // InternalMenuDsl.g:2057:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             {
-            // InternalMenuDsl.g:1957:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
-            int alt38=4;
+            // InternalMenuDsl.g:2057:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            int alt36=4;
             switch ( input.LA(1) ) {
-            case 56:
+            case 58:
                 {
-                alt38=1;
+                alt36=1;
                 }
                 break;
-            case 57:
+            case 59:
                 {
-                alt38=2;
+                alt36=2;
                 }
                 break;
-            case 58:
+            case 60:
                 {
-                alt38=3;
+                alt36=3;
                 }
                 break;
-            case 59:
+            case 61:
                 {
-                alt38=4;
+                alt36=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 38, 0, input);
+                    new NoViableAltException("", 36, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt38) {
+            switch (alt36) {
                 case 1 :
-                    // InternalMenuDsl.g:1958:3: kw= '=='
+                    // InternalMenuDsl.g:2058:3: kw= '=='
                     {
-                    kw=(Token)match(input,56,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,58,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -5501,9 +5786,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:1964:3: kw= '!='
+                    // InternalMenuDsl.g:2064:3: kw= '!='
                     {
-                    kw=(Token)match(input,57,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,59,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -5514,9 +5799,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:1970:3: kw= '==='
+                    // InternalMenuDsl.g:2070:3: kw= '==='
                     {
-                    kw=(Token)match(input,58,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,60,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -5527,9 +5812,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:1976:3: kw= '!=='
+                    // InternalMenuDsl.g:2076:3: kw= '!=='
                     {
-                    kw=(Token)match(input,59,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,61,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -5564,7 +5849,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // InternalMenuDsl.g:1985:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
+    // InternalMenuDsl.g:2085:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
     public final EObject entryRuleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5572,8 +5857,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:1985:62: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
-            // InternalMenuDsl.g:1986:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
+            // InternalMenuDsl.g:2085:62: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
+            // InternalMenuDsl.g:2086:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXRelationalExpressionRule()); 
@@ -5604,7 +5889,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // InternalMenuDsl.g:1992: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 ) ) ) )* ) ;
+    // InternalMenuDsl.g:2092: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;
 
@@ -5620,18 +5905,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:1998:2: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
-            // InternalMenuDsl.g:1999:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalMenuDsl.g:2098:2: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
+            // InternalMenuDsl.g:2099:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
             {
-            // InternalMenuDsl.g:1999:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
-            // InternalMenuDsl.g:2000:3: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalMenuDsl.g:2099:2: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalMenuDsl.g:2100: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_39);
+            pushFollow(FOLLOW_40);
             this_XOtherOperatorExpression_0=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -5642,50 +5927,50 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:2008:3: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
-            loop39:
+            // InternalMenuDsl.g:2108:3: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            loop37:
             do {
-                int alt39=3;
+                int alt37=3;
                 switch ( input.LA(1) ) {
-                case 51:
+                case 53:
                     {
-                    int LA39_2 = input.LA(2);
+                    int LA37_2 = input.LA(2);
 
                     if ( (synpred12_InternalMenuDsl()) ) {
-                        alt39=2;
+                        alt37=2;
                     }
 
 
                     }
                     break;
-                case 52:
+                case 54:
                     {
-                    int LA39_3 = input.LA(2);
+                    int LA37_3 = input.LA(2);
 
                     if ( (synpred12_InternalMenuDsl()) ) {
-                        alt39=2;
+                        alt37=2;
                     }
 
 
                     }
                     break;
-                case 60:
+                case 62:
                     {
-                    int LA39_4 = input.LA(2);
+                    int LA37_4 = input.LA(2);
 
                     if ( (synpred11_InternalMenuDsl()) ) {
-                        alt39=1;
+                        alt37=1;
                     }
 
 
                     }
                     break;
-                case 53:
+                case 55:
                     {
-                    int LA39_5 = input.LA(2);
+                    int LA37_5 = input.LA(2);
 
                     if ( (synpred12_InternalMenuDsl()) ) {
-                        alt39=2;
+                        alt37=2;
                     }
 
 
@@ -5694,21 +5979,21 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt39) {
+                switch (alt37) {
             	case 1 :
-            	    // InternalMenuDsl.g:2009:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalMenuDsl.g:2109:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
             	    {
-            	    // InternalMenuDsl.g:2009:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
-            	    // InternalMenuDsl.g:2010:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalMenuDsl.g:2109:4: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalMenuDsl.g:2110:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // InternalMenuDsl.g:2010:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
-            	    // InternalMenuDsl.g:2011:6: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
+            	    // InternalMenuDsl.g:2110:5: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
+            	    // InternalMenuDsl.g:2111:6: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
             	    {
-            	    // InternalMenuDsl.g:2017:6: ( () otherlv_2= 'instanceof' )
-            	    // InternalMenuDsl.g:2018:7: () otherlv_2= 'instanceof'
+            	    // InternalMenuDsl.g:2117:6: ( () otherlv_2= 'instanceof' )
+            	    // InternalMenuDsl.g:2118:7: () otherlv_2= 'instanceof'
             	    {
-            	    // InternalMenuDsl.g:2018:7: ()
-            	    // InternalMenuDsl.g:2019:8: 
+            	    // InternalMenuDsl.g:2118:7: ()
+            	    // InternalMenuDsl.g:2119:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5720,7 +6005,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,60,FOLLOW_40); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,62,FOLLOW_41); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      							newLeafNode(otherlv_2, grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1());
@@ -5732,18 +6017,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2031:5: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // InternalMenuDsl.g:2032:6: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalMenuDsl.g:2131:5: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalMenuDsl.g:2132:6: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // InternalMenuDsl.g:2032:6: (lv_type_3_0= ruleJvmTypeReference )
-            	    // InternalMenuDsl.g:2033:7: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalMenuDsl.g:2132:6: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalMenuDsl.g:2133:7: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      							newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_39);
+            	    pushFollow(FOLLOW_40);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -5774,19 +6059,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalMenuDsl.g:2052:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalMenuDsl.g:2152:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
             	    {
-            	    // InternalMenuDsl.g:2052:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
-            	    // InternalMenuDsl.g:2053:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalMenuDsl.g:2152:4: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalMenuDsl.g:2153:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
             	    {
-            	    // InternalMenuDsl.g:2053:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
-            	    // InternalMenuDsl.g:2054:6: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
+            	    // InternalMenuDsl.g:2153:5: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
+            	    // InternalMenuDsl.g:2154:6: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
             	    {
-            	    // InternalMenuDsl.g:2064:6: ( () ( ( ruleOpCompare ) ) )
-            	    // InternalMenuDsl.g:2065:7: () ( ( ruleOpCompare ) )
+            	    // InternalMenuDsl.g:2164:6: ( () ( ( ruleOpCompare ) ) )
+            	    // InternalMenuDsl.g:2165:7: () ( ( ruleOpCompare ) )
             	    {
-            	    // InternalMenuDsl.g:2065:7: ()
-            	    // InternalMenuDsl.g:2066:8: 
+            	    // InternalMenuDsl.g:2165:7: ()
+            	    // InternalMenuDsl.g:2166:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5798,11 +6083,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2072:7: ( ( ruleOpCompare ) )
-            	    // InternalMenuDsl.g:2073:8: ( ruleOpCompare )
+            	    // InternalMenuDsl.g:2172:7: ( ( ruleOpCompare ) )
+            	    // InternalMenuDsl.g:2173:8: ( ruleOpCompare )
             	    {
-            	    // InternalMenuDsl.g:2073:8: ( ruleOpCompare )
-            	    // InternalMenuDsl.g:2074:9: ruleOpCompare
+            	    // InternalMenuDsl.g:2173:8: ( ruleOpCompare )
+            	    // InternalMenuDsl.g:2174:9: ruleOpCompare
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5816,7 +6101,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      									newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0());
             	      								
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpCompare();
 
             	    state._fsp--;
@@ -5838,18 +6123,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2090:5: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
-            	    // InternalMenuDsl.g:2091:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalMenuDsl.g:2190:5: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalMenuDsl.g:2191:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
             	    {
-            	    // InternalMenuDsl.g:2091:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
-            	    // InternalMenuDsl.g:2092:7: lv_rightOperand_6_0= ruleXOtherOperatorExpression
+            	    // InternalMenuDsl.g:2191:6: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalMenuDsl.g:2192:7: lv_rightOperand_6_0= ruleXOtherOperatorExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      							newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_39);
+            	    pushFollow(FOLLOW_40);
             	    lv_rightOperand_6_0=ruleXOtherOperatorExpression();
 
             	    state._fsp--;
@@ -5881,7 +6166,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop39;
+            	    break loop37;
                 }
             } while (true);
 
@@ -5910,7 +6195,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // InternalMenuDsl.g:2115:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
+    // InternalMenuDsl.g:2215:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
     public final String entryRuleOpCompare() throws RecognitionException {
         String current = null;
 
@@ -5918,8 +6203,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2115:49: (iv_ruleOpCompare= ruleOpCompare EOF )
-            // InternalMenuDsl.g:2116:2: iv_ruleOpCompare= ruleOpCompare EOF
+            // InternalMenuDsl.g:2215:49: (iv_ruleOpCompare= ruleOpCompare EOF )
+            // InternalMenuDsl.g:2216:2: iv_ruleOpCompare= ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpCompareRule()); 
@@ -5950,7 +6235,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpCompare"
-    // InternalMenuDsl.g:2122:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
+    // InternalMenuDsl.g:2222:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
     public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5960,54 +6245,54 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2128:2: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
-            // InternalMenuDsl.g:2129:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalMenuDsl.g:2228:2: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
+            // InternalMenuDsl.g:2229:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             {
-            // InternalMenuDsl.g:2129:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
-            int alt40=4;
+            // InternalMenuDsl.g:2229:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            int alt38=4;
             switch ( input.LA(1) ) {
-            case 53:
+            case 55:
                 {
-                alt40=1;
+                alt38=1;
                 }
                 break;
-            case 51:
+            case 53:
                 {
-                int LA40_2 = input.LA(2);
+                int LA38_2 = input.LA(2);
 
-                if ( (LA40_2==42) ) {
-                    alt40=2;
+                if ( (LA38_2==EOF||(LA38_2>=RULE_STRING && LA38_2<=RULE_DECIMAL)||LA38_2==26||(LA38_2>=34 && LA38_2<=36)||LA38_2==41||(LA38_2>=45 && LA38_2<=46)||LA38_2==53||(LA38_2>=69 && LA38_2<=70)||LA38_2==74||LA38_2==82||LA38_2==84||(LA38_2>=88 && LA38_2<=90)||(LA38_2>=93 && LA38_2<=102)||LA38_2==104) ) {
+                    alt38=4;
                 }
-                else if ( (LA40_2==EOF||(LA40_2>=RULE_STRING && LA40_2<=RULE_DECIMAL)||LA40_2==14||(LA40_2>=32 && LA40_2<=34)||LA40_2==39||(LA40_2>=43 && LA40_2<=44)||LA40_2==51||(LA40_2>=67 && LA40_2<=68)||LA40_2==72||LA40_2==80||LA40_2==82||(LA40_2>=86 && LA40_2<=88)||(LA40_2>=91 && LA40_2<=100)||LA40_2==102) ) {
-                    alt40=4;
+                else if ( (LA38_2==44) ) {
+                    alt38=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 40, 2, input);
+                        new NoViableAltException("", 38, 2, input);
 
                     throw nvae;
                 }
                 }
                 break;
-            case 52:
+            case 54:
                 {
-                alt40=3;
+                alt38=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 40, 0, input);
+                    new NoViableAltException("", 38, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt40) {
+            switch (alt38) {
                 case 1 :
-                    // InternalMenuDsl.g:2130:3: kw= '>='
+                    // InternalMenuDsl.g:2230:3: kw= '>='
                     {
-                    kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,55,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6018,19 +6303,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2136:3: (kw= '<' kw= '=' )
+                    // InternalMenuDsl.g:2236:3: (kw= '<' kw= '=' )
                     {
-                    // InternalMenuDsl.g:2136:3: (kw= '<' kw= '=' )
-                    // InternalMenuDsl.g:2137:4: kw= '<' kw= '='
+                    // InternalMenuDsl.g:2236:3: (kw= '<' kw= '=' )
+                    // InternalMenuDsl.g:2237:4: kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,51,FOLLOW_26); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_27); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0());
                       			
                     }
-                    kw=(Token)match(input,42,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,44,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -6044,9 +6329,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2149:3: kw= '>'
+                    // InternalMenuDsl.g:2249:3: kw= '>'
                     {
-                    kw=(Token)match(input,52,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,54,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6057,9 +6342,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2155:3: kw= '<'
+                    // InternalMenuDsl.g:2255:3: kw= '<'
                     {
-                    kw=(Token)match(input,51,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6094,7 +6379,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // InternalMenuDsl.g:2164:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
+    // InternalMenuDsl.g:2264:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
     public final EObject entryRuleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6102,8 +6387,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2164:65: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
-            // InternalMenuDsl.g:2165:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
+            // InternalMenuDsl.g:2264:65: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
+            // InternalMenuDsl.g:2265:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOtherOperatorExpressionRule()); 
@@ -6134,7 +6419,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // InternalMenuDsl.g:2171:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
+    // InternalMenuDsl.g:2271: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;
 
@@ -6147,18 +6432,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2177:2: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
-            // InternalMenuDsl.g:2178:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalMenuDsl.g:2277:2: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
+            // InternalMenuDsl.g:2278:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
             {
-            // InternalMenuDsl.g:2178:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
-            // InternalMenuDsl.g:2179:3: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalMenuDsl.g:2278:2: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalMenuDsl.g:2279:3: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_41);
+            pushFollow(FOLLOW_42);
             this_XAdditiveExpression_0=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -6169,23 +6454,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:2187:3: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
-            loop41:
+            // InternalMenuDsl.g:2287:3: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            loop39:
             do {
-                int alt41=2;
-                alt41 = dfa41.predict(input);
-                switch (alt41) {
+                int alt39=2;
+                alt39 = dfa39.predict(input);
+                switch (alt39) {
             	case 1 :
-            	    // InternalMenuDsl.g:2188:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalMenuDsl.g:2288:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
             	    {
-            	    // InternalMenuDsl.g:2188:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
-            	    // InternalMenuDsl.g:2189:5: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
+            	    // InternalMenuDsl.g:2288:4: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
+            	    // InternalMenuDsl.g:2289:5: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
             	    {
-            	    // InternalMenuDsl.g:2199:5: ( () ( ( ruleOpOther ) ) )
-            	    // InternalMenuDsl.g:2200:6: () ( ( ruleOpOther ) )
+            	    // InternalMenuDsl.g:2299:5: ( () ( ( ruleOpOther ) ) )
+            	    // InternalMenuDsl.g:2300:6: () ( ( ruleOpOther ) )
             	    {
-            	    // InternalMenuDsl.g:2200:6: ()
-            	    // InternalMenuDsl.g:2201:7: 
+            	    // InternalMenuDsl.g:2300:6: ()
+            	    // InternalMenuDsl.g:2301:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6197,11 +6482,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2207:6: ( ( ruleOpOther ) )
-            	    // InternalMenuDsl.g:2208:7: ( ruleOpOther )
+            	    // InternalMenuDsl.g:2307:6: ( ( ruleOpOther ) )
+            	    // InternalMenuDsl.g:2308:7: ( ruleOpOther )
             	    {
-            	    // InternalMenuDsl.g:2208:7: ( ruleOpOther )
-            	    // InternalMenuDsl.g:2209:8: ruleOpOther
+            	    // InternalMenuDsl.g:2308:7: ( ruleOpOther )
+            	    // InternalMenuDsl.g:2309:8: ruleOpOther
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6215,7 +6500,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpOther();
 
             	    state._fsp--;
@@ -6237,18 +6522,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2225:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
-            	    // InternalMenuDsl.g:2226:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalMenuDsl.g:2325:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalMenuDsl.g:2326:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
             	    {
-            	    // InternalMenuDsl.g:2226:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
-            	    // InternalMenuDsl.g:2227:6: lv_rightOperand_3_0= ruleXAdditiveExpression
+            	    // InternalMenuDsl.g:2326:5: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalMenuDsl.g:2327:6: lv_rightOperand_3_0= ruleXAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_41);
+            	    pushFollow(FOLLOW_42);
             	    lv_rightOperand_3_0=ruleXAdditiveExpression();
 
             	    state._fsp--;
@@ -6277,7 +6562,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop41;
+            	    break loop39;
                 }
             } while (true);
 
@@ -6306,7 +6591,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpOther"
-    // InternalMenuDsl.g:2249:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
+    // InternalMenuDsl.g:2349:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
     public final String entryRuleOpOther() throws RecognitionException {
         String current = null;
 
@@ -6314,8 +6599,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2249:47: (iv_ruleOpOther= ruleOpOther EOF )
-            // InternalMenuDsl.g:2250:2: iv_ruleOpOther= ruleOpOther EOF
+            // InternalMenuDsl.g:2349:47: (iv_ruleOpOther= ruleOpOther EOF )
+            // InternalMenuDsl.g:2350:2: iv_ruleOpOther= ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOtherRule()); 
@@ -6346,7 +6631,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpOther"
-    // InternalMenuDsl.g:2256:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
+    // InternalMenuDsl.g:2356: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();
 
@@ -6356,17 +6641,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2262:2: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
-            // InternalMenuDsl.g:2263:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalMenuDsl.g:2362:2: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
+            // InternalMenuDsl.g:2363:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             {
-            // InternalMenuDsl.g:2263:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
-            int alt44=9;
-            alt44 = dfa44.predict(input);
-            switch (alt44) {
+            // InternalMenuDsl.g:2363:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            int alt42=9;
+            alt42 = dfa42.predict(input);
+            switch (alt42) {
                 case 1 :
-                    // InternalMenuDsl.g:2264:3: kw= '->'
+                    // InternalMenuDsl.g:2364:3: kw= '->'
                     {
-                    kw=(Token)match(input,61,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,63,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6377,9 +6662,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2270:3: kw= '..<'
+                    // InternalMenuDsl.g:2370:3: kw= '..<'
                     {
-                    kw=(Token)match(input,62,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,64,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6390,19 +6675,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2276:3: (kw= '>' kw= '..' )
+                    // InternalMenuDsl.g:2376:3: (kw= '>' kw= '..' )
                     {
-                    // InternalMenuDsl.g:2276:3: (kw= '>' kw= '..' )
-                    // InternalMenuDsl.g:2277:4: kw= '>' kw= '..'
+                    // InternalMenuDsl.g:2376:3: (kw= '>' kw= '..' )
+                    // InternalMenuDsl.g:2377:4: kw= '>' kw= '..'
                     {
-                    kw=(Token)match(input,52,FOLLOW_42); if (state.failed) return current;
+                    kw=(Token)match(input,54,FOLLOW_43); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0());
                       			
                     }
-                    kw=(Token)match(input,63,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,65,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
@@ -6416,9 +6701,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2289:3: kw= '..'
+                    // InternalMenuDsl.g:2389:3: kw= '..'
                     {
-                    kw=(Token)match(input,63,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,65,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6429,9 +6714,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:2295:3: kw= '=>'
+                    // InternalMenuDsl.g:2395:3: kw= '=>'
                     {
-                    kw=(Token)match(input,64,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6442,35 +6727,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:2301:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalMenuDsl.g:2401:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
                     {
-                    // InternalMenuDsl.g:2301:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
-                    // InternalMenuDsl.g:2302:4: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalMenuDsl.g:2401:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalMenuDsl.g:2402:4: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     {
-                    kw=(Token)match(input,52,FOLLOW_43); if (state.failed) return current;
+                    kw=(Token)match(input,54,FOLLOW_44); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0());
                       			
                     }
-                    // InternalMenuDsl.g:2307:4: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
-                    int alt42=2;
-                    int LA42_0 = input.LA(1);
+                    // InternalMenuDsl.g:2407:4: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    int alt40=2;
+                    int LA40_0 = input.LA(1);
 
-                    if ( (LA42_0==52) ) {
-                        int LA42_1 = input.LA(2);
+                    if ( (LA40_0==54) ) {
+                        int LA40_1 = input.LA(2);
 
-                        if ( (LA42_1==EOF||(LA42_1>=RULE_STRING && LA42_1<=RULE_DECIMAL)||LA42_1==14||(LA42_1>=32 && LA42_1<=34)||LA42_1==39||(LA42_1>=43 && LA42_1<=44)||LA42_1==51||(LA42_1>=67 && LA42_1<=68)||LA42_1==72||LA42_1==80||LA42_1==82||(LA42_1>=86 && LA42_1<=88)||(LA42_1>=91 && LA42_1<=100)||LA42_1==102) ) {
-                            alt42=2;
+                        if ( (LA40_1==EOF||(LA40_1>=RULE_STRING && LA40_1<=RULE_DECIMAL)||LA40_1==26||(LA40_1>=34 && LA40_1<=36)||LA40_1==41||(LA40_1>=45 && LA40_1<=46)||LA40_1==53||(LA40_1>=69 && LA40_1<=70)||LA40_1==74||LA40_1==82||LA40_1==84||(LA40_1>=88 && LA40_1<=90)||(LA40_1>=93 && LA40_1<=102)||LA40_1==104) ) {
+                            alt40=2;
                         }
-                        else if ( (LA42_1==52) && (synpred14_InternalMenuDsl())) {
-                            alt42=1;
+                        else if ( (LA40_1==54) && (synpred14_InternalMenuDsl())) {
+                            alt40=1;
                         }
                         else {
                             if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
-                                new NoViableAltException("", 42, 1, input);
+                                new NoViableAltException("", 40, 1, input);
 
                             throw nvae;
                         }
@@ -6478,28 +6763,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 42, 0, input);
+                            new NoViableAltException("", 40, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt42) {
+                    switch (alt40) {
                         case 1 :
-                            // InternalMenuDsl.g:2308:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalMenuDsl.g:2408:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
                             {
-                            // InternalMenuDsl.g:2308:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
-                            // InternalMenuDsl.g:2309:6: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
+                            // InternalMenuDsl.g:2408:5: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalMenuDsl.g:2409:6: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
                             {
-                            // InternalMenuDsl.g:2314:6: (kw= '>' kw= '>' )
-                            // InternalMenuDsl.g:2315:7: kw= '>' kw= '>'
+                            // InternalMenuDsl.g:2414:6: (kw= '>' kw= '>' )
+                            // InternalMenuDsl.g:2415:7: kw= '>' kw= '>'
                             {
-                            kw=(Token)match(input,52,FOLLOW_43); if (state.failed) return current;
+                            kw=(Token)match(input,54,FOLLOW_44); 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,52,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,54,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							current.merge(kw);
@@ -6516,9 +6801,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:2328:5: kw= '>'
+                            // InternalMenuDsl.g:2428:5: kw= '>'
                             {
-                            kw=(Token)match(input,52,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,54,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -6538,67 +6823,67 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:2336:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalMenuDsl.g:2436:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
                     {
-                    // InternalMenuDsl.g:2336:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
-                    // InternalMenuDsl.g:2337:4: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalMenuDsl.g:2436:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalMenuDsl.g:2437:4: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     {
-                    kw=(Token)match(input,51,FOLLOW_44); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_45); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				current.merge(kw);
                       				newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0());
                       			
                     }
-                    // InternalMenuDsl.g:2342:4: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
-                    int alt43=3;
-                    int LA43_0 = input.LA(1);
+                    // InternalMenuDsl.g:2442:4: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    int alt41=3;
+                    int LA41_0 = input.LA(1);
 
-                    if ( (LA43_0==51) ) {
-                        int LA43_1 = input.LA(2);
+                    if ( (LA41_0==53) ) {
+                        int LA41_1 = input.LA(2);
 
                         if ( (synpred15_InternalMenuDsl()) ) {
-                            alt43=1;
+                            alt41=1;
                         }
                         else if ( (true) ) {
-                            alt43=2;
+                            alt41=2;
                         }
                         else {
                             if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
-                                new NoViableAltException("", 43, 1, input);
+                                new NoViableAltException("", 41, 1, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA43_0==64) ) {
-                        alt43=3;
+                    else if ( (LA41_0==66) ) {
+                        alt41=3;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 43, 0, input);
+                            new NoViableAltException("", 41, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt43) {
+                    switch (alt41) {
                         case 1 :
-                            // InternalMenuDsl.g:2343:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalMenuDsl.g:2443:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
                             {
-                            // InternalMenuDsl.g:2343:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
-                            // InternalMenuDsl.g:2344:6: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
+                            // InternalMenuDsl.g:2443:5: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalMenuDsl.g:2444:6: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
                             {
-                            // InternalMenuDsl.g:2349:6: (kw= '<' kw= '<' )
-                            // InternalMenuDsl.g:2350:7: kw= '<' kw= '<'
+                            // InternalMenuDsl.g:2449:6: (kw= '<' kw= '<' )
+                            // InternalMenuDsl.g:2450:7: kw= '<' kw= '<'
                             {
-                            kw=(Token)match(input,51,FOLLOW_33); if (state.failed) return current;
+                            kw=(Token)match(input,53,FOLLOW_34); 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,51,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							current.merge(kw);
@@ -6615,9 +6900,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:2363:5: kw= '<'
+                            // InternalMenuDsl.g:2463:5: kw= '<'
                             {
-                            kw=(Token)match(input,51,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -6628,9 +6913,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 3 :
-                            // InternalMenuDsl.g:2369:5: kw= '=>'
+                            // InternalMenuDsl.g:2469:5: kw= '=>'
                             {
-                            kw=(Token)match(input,64,FOLLOW_2); if (state.failed) return current;
+                            kw=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
@@ -6650,9 +6935,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 8 :
-                    // InternalMenuDsl.g:2377:3: kw= '<>'
+                    // InternalMenuDsl.g:2477:3: kw= '<>'
                     {
-                    kw=(Token)match(input,65,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,67,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6663,9 +6948,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 9 :
-                    // InternalMenuDsl.g:2383:3: kw= '?:'
+                    // InternalMenuDsl.g:2483:3: kw= '?:'
                     {
-                    kw=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -6700,7 +6985,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // InternalMenuDsl.g:2392:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
+    // InternalMenuDsl.g:2492:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
     public final EObject entryRuleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6708,8 +6993,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2392:60: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
-            // InternalMenuDsl.g:2393:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
+            // InternalMenuDsl.g:2492:60: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
+            // InternalMenuDsl.g:2493:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAdditiveExpressionRule()); 
@@ -6740,7 +7025,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // InternalMenuDsl.g:2399:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
+    // InternalMenuDsl.g:2499: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;
 
@@ -6753,18 +7038,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2405:2: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
-            // InternalMenuDsl.g:2406:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalMenuDsl.g:2505:2: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
+            // InternalMenuDsl.g:2506:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
             {
-            // InternalMenuDsl.g:2406:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
-            // InternalMenuDsl.g:2407:3: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalMenuDsl.g:2506:2: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalMenuDsl.g:2507:3: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_45);
+            pushFollow(FOLLOW_46);
             this_XMultiplicativeExpression_0=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -6775,44 +7060,44 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:2415:3: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
-            loop45:
+            // InternalMenuDsl.g:2515:3: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            loop43:
             do {
-                int alt45=2;
-                int LA45_0 = input.LA(1);
+                int alt43=2;
+                int LA43_0 = input.LA(1);
 
-                if ( (LA45_0==67) ) {
-                    int LA45_2 = input.LA(2);
+                if ( (LA43_0==69) ) {
+                    int LA43_2 = input.LA(2);
 
                     if ( (synpred16_InternalMenuDsl()) ) {
-                        alt45=1;
+                        alt43=1;
                     }
 
 
                 }
-                else if ( (LA45_0==68) ) {
-                    int LA45_3 = input.LA(2);
+                else if ( (LA43_0==70) ) {
+                    int LA43_3 = input.LA(2);
 
                     if ( (synpred16_InternalMenuDsl()) ) {
-                        alt45=1;
+                        alt43=1;
                     }
 
 
                 }
 
 
-                switch (alt45) {
+                switch (alt43) {
             	case 1 :
-            	    // InternalMenuDsl.g:2416:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalMenuDsl.g:2516:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
             	    {
-            	    // InternalMenuDsl.g:2416:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
-            	    // InternalMenuDsl.g:2417:5: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
+            	    // InternalMenuDsl.g:2516:4: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
+            	    // InternalMenuDsl.g:2517:5: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
             	    {
-            	    // InternalMenuDsl.g:2427:5: ( () ( ( ruleOpAdd ) ) )
-            	    // InternalMenuDsl.g:2428:6: () ( ( ruleOpAdd ) )
+            	    // InternalMenuDsl.g:2527:5: ( () ( ( ruleOpAdd ) ) )
+            	    // InternalMenuDsl.g:2528:6: () ( ( ruleOpAdd ) )
             	    {
-            	    // InternalMenuDsl.g:2428:6: ()
-            	    // InternalMenuDsl.g:2429:7: 
+            	    // InternalMenuDsl.g:2528:6: ()
+            	    // InternalMenuDsl.g:2529:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6824,11 +7109,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2435:6: ( ( ruleOpAdd ) )
-            	    // InternalMenuDsl.g:2436:7: ( ruleOpAdd )
+            	    // InternalMenuDsl.g:2535:6: ( ( ruleOpAdd ) )
+            	    // InternalMenuDsl.g:2536:7: ( ruleOpAdd )
             	    {
-            	    // InternalMenuDsl.g:2436:7: ( ruleOpAdd )
-            	    // InternalMenuDsl.g:2437:8: ruleOpAdd
+            	    // InternalMenuDsl.g:2536:7: ( ruleOpAdd )
+            	    // InternalMenuDsl.g:2537:8: ruleOpAdd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6842,7 +7127,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpAdd();
 
             	    state._fsp--;
@@ -6864,18 +7149,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2453:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
-            	    // InternalMenuDsl.g:2454:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalMenuDsl.g:2553:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalMenuDsl.g:2554:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
             	    {
-            	    // InternalMenuDsl.g:2454:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
-            	    // InternalMenuDsl.g:2455:6: lv_rightOperand_3_0= ruleXMultiplicativeExpression
+            	    // InternalMenuDsl.g:2554:5: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalMenuDsl.g:2555:6: lv_rightOperand_3_0= ruleXMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_45);
+            	    pushFollow(FOLLOW_46);
             	    lv_rightOperand_3_0=ruleXMultiplicativeExpression();
 
             	    state._fsp--;
@@ -6904,7 +7189,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop45;
+            	    break loop43;
                 }
             } while (true);
 
@@ -6933,7 +7218,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // InternalMenuDsl.g:2477:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
+    // InternalMenuDsl.g:2577:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
     public final String entryRuleOpAdd() throws RecognitionException {
         String current = null;
 
@@ -6941,8 +7226,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2477:45: (iv_ruleOpAdd= ruleOpAdd EOF )
-            // InternalMenuDsl.g:2478:2: iv_ruleOpAdd= ruleOpAdd EOF
+            // InternalMenuDsl.g:2577:45: (iv_ruleOpAdd= ruleOpAdd EOF )
+            // InternalMenuDsl.g:2578:2: iv_ruleOpAdd= ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAddRule()); 
@@ -6973,7 +7258,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpAdd"
-    // InternalMenuDsl.g:2484:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
+    // InternalMenuDsl.g:2584:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
     public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6983,31 +7268,31 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2490:2: ( (kw= '+' | kw= '-' ) )
-            // InternalMenuDsl.g:2491:2: (kw= '+' | kw= '-' )
+            // InternalMenuDsl.g:2590:2: ( (kw= '+' | kw= '-' ) )
+            // InternalMenuDsl.g:2591:2: (kw= '+' | kw= '-' )
             {
-            // InternalMenuDsl.g:2491:2: (kw= '+' | kw= '-' )
-            int alt46=2;
-            int LA46_0 = input.LA(1);
+            // InternalMenuDsl.g:2591:2: (kw= '+' | kw= '-' )
+            int alt44=2;
+            int LA44_0 = input.LA(1);
 
-            if ( (LA46_0==67) ) {
-                alt46=1;
+            if ( (LA44_0==69) ) {
+                alt44=1;
             }
-            else if ( (LA46_0==68) ) {
-                alt46=2;
+            else if ( (LA44_0==70) ) {
+                alt44=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 46, 0, input);
+                    new NoViableAltException("", 44, 0, input);
 
                 throw nvae;
             }
-            switch (alt46) {
+            switch (alt44) {
                 case 1 :
-                    // InternalMenuDsl.g:2492:3: kw= '+'
+                    // InternalMenuDsl.g:2592:3: kw= '+'
                     {
-                    kw=(Token)match(input,67,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7018,9 +7303,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2498:3: kw= '-'
+                    // InternalMenuDsl.g:2598:3: kw= '-'
                     {
-                    kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,70,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7055,7 +7340,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // InternalMenuDsl.g:2507:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
+    // InternalMenuDsl.g:2607:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
     public final EObject entryRuleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7063,8 +7348,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2507:66: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
-            // InternalMenuDsl.g:2508:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
+            // InternalMenuDsl.g:2607:66: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
+            // InternalMenuDsl.g:2608:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMultiplicativeExpressionRule()); 
@@ -7095,7 +7380,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // InternalMenuDsl.g:2514:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
+    // InternalMenuDsl.g:2614: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;
 
@@ -7108,18 +7393,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2520:2: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
-            // InternalMenuDsl.g:2521:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalMenuDsl.g:2620:2: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
+            // InternalMenuDsl.g:2621:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
             {
-            // InternalMenuDsl.g:2521:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
-            // InternalMenuDsl.g:2522:3: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalMenuDsl.g:2621:2: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalMenuDsl.g:2622:3: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_46);
+            pushFollow(FOLLOW_47);
             this_XUnaryOperation_0=ruleXUnaryOperation();
 
             state._fsp--;
@@ -7130,50 +7415,50 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:2530:3: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
-            loop47:
+            // InternalMenuDsl.g:2630:3: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            loop45:
             do {
-                int alt47=2;
+                int alt45=2;
                 switch ( input.LA(1) ) {
-                case 35:
+                case 37:
                     {
-                    int LA47_2 = input.LA(2);
+                    int LA45_2 = input.LA(2);
 
                     if ( (synpred17_InternalMenuDsl()) ) {
-                        alt47=1;
+                        alt45=1;
                     }
 
 
                     }
                     break;
-                case 69:
+                case 71:
                     {
-                    int LA47_3 = input.LA(2);
+                    int LA45_3 = input.LA(2);
 
                     if ( (synpred17_InternalMenuDsl()) ) {
-                        alt47=1;
+                        alt45=1;
                     }
 
 
                     }
                     break;
-                case 70:
+                case 72:
                     {
-                    int LA47_4 = input.LA(2);
+                    int LA45_4 = input.LA(2);
 
                     if ( (synpred17_InternalMenuDsl()) ) {
-                        alt47=1;
+                        alt45=1;
                     }
 
 
                     }
                     break;
-                case 71:
+                case 73:
                     {
-                    int LA47_5 = input.LA(2);
+                    int LA45_5 = input.LA(2);
 
                     if ( (synpred17_InternalMenuDsl()) ) {
-                        alt47=1;
+                        alt45=1;
                     }
 
 
@@ -7182,18 +7467,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt47) {
+                switch (alt45) {
             	case 1 :
-            	    // InternalMenuDsl.g:2531:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalMenuDsl.g:2631:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
             	    {
-            	    // InternalMenuDsl.g:2531:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
-            	    // InternalMenuDsl.g:2532:5: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
+            	    // InternalMenuDsl.g:2631:4: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
+            	    // InternalMenuDsl.g:2632:5: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
             	    {
-            	    // InternalMenuDsl.g:2542:5: ( () ( ( ruleOpMulti ) ) )
-            	    // InternalMenuDsl.g:2543:6: () ( ( ruleOpMulti ) )
+            	    // InternalMenuDsl.g:2642:5: ( () ( ( ruleOpMulti ) ) )
+            	    // InternalMenuDsl.g:2643:6: () ( ( ruleOpMulti ) )
             	    {
-            	    // InternalMenuDsl.g:2543:6: ()
-            	    // InternalMenuDsl.g:2544:7: 
+            	    // InternalMenuDsl.g:2643:6: ()
+            	    // InternalMenuDsl.g:2644:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7205,11 +7490,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2550:6: ( ( ruleOpMulti ) )
-            	    // InternalMenuDsl.g:2551:7: ( ruleOpMulti )
+            	    // InternalMenuDsl.g:2650:6: ( ( ruleOpMulti ) )
+            	    // InternalMenuDsl.g:2651:7: ( ruleOpMulti )
             	    {
-            	    // InternalMenuDsl.g:2551:7: ( ruleOpMulti )
-            	    // InternalMenuDsl.g:2552:8: ruleOpMulti
+            	    // InternalMenuDsl.g:2651:7: ( ruleOpMulti )
+            	    // InternalMenuDsl.g:2652:8: ruleOpMulti
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7223,7 +7508,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      								newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0());
             	      							
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpMulti();
 
             	    state._fsp--;
@@ -7245,18 +7530,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2568:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
-            	    // InternalMenuDsl.g:2569:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalMenuDsl.g:2668:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalMenuDsl.g:2669:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
             	    {
-            	    // InternalMenuDsl.g:2569:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
-            	    // InternalMenuDsl.g:2570:6: lv_rightOperand_3_0= ruleXUnaryOperation
+            	    // InternalMenuDsl.g:2669:5: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalMenuDsl.g:2670:6: lv_rightOperand_3_0= ruleXUnaryOperation
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_46);
+            	    pushFollow(FOLLOW_47);
             	    lv_rightOperand_3_0=ruleXUnaryOperation();
 
             	    state._fsp--;
@@ -7285,7 +7570,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop47;
+            	    break loop45;
                 }
             } while (true);
 
@@ -7314,7 +7599,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // InternalMenuDsl.g:2592:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
+    // InternalMenuDsl.g:2692:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
     public final String entryRuleOpMulti() throws RecognitionException {
         String current = null;
 
@@ -7322,8 +7607,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2592:47: (iv_ruleOpMulti= ruleOpMulti EOF )
-            // InternalMenuDsl.g:2593:2: iv_ruleOpMulti= ruleOpMulti EOF
+            // InternalMenuDsl.g:2692:47: (iv_ruleOpMulti= ruleOpMulti EOF )
+            // InternalMenuDsl.g:2693:2: iv_ruleOpMulti= ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiRule()); 
@@ -7354,7 +7639,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpMulti"
-    // InternalMenuDsl.g:2599:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
+    // InternalMenuDsl.g:2699:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
     public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7364,45 +7649,45 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2605:2: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
-            // InternalMenuDsl.g:2606:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalMenuDsl.g:2705:2: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
+            // InternalMenuDsl.g:2706:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             {
-            // InternalMenuDsl.g:2606:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
-            int alt48=4;
+            // InternalMenuDsl.g:2706:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            int alt46=4;
             switch ( input.LA(1) ) {
-            case 35:
+            case 37:
                 {
-                alt48=1;
+                alt46=1;
                 }
                 break;
-            case 69:
+            case 71:
                 {
-                alt48=2;
+                alt46=2;
                 }
                 break;
-            case 70:
+            case 72:
                 {
-                alt48=3;
+                alt46=3;
                 }
                 break;
-            case 71:
+            case 73:
                 {
-                alt48=4;
+                alt46=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 48, 0, input);
+                    new NoViableAltException("", 46, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt48) {
+            switch (alt46) {
                 case 1 :
-                    // InternalMenuDsl.g:2607:3: kw= '*'
+                    // InternalMenuDsl.g:2707:3: kw= '*'
                     {
-                    kw=(Token)match(input,35,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,37,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7413,9 +7698,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2613:3: kw= '**'
+                    // InternalMenuDsl.g:2713:3: kw= '**'
                     {
-                    kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,71,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7426,9 +7711,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2619:3: kw= '/'
+                    // InternalMenuDsl.g:2719:3: kw= '/'
                     {
-                    kw=(Token)match(input,70,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7439,9 +7724,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:2625:3: kw= '%'
+                    // InternalMenuDsl.g:2725:3: kw= '%'
                     {
-                    kw=(Token)match(input,71,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,73,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7476,7 +7761,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // InternalMenuDsl.g:2634:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
+    // InternalMenuDsl.g:2734:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
     public final EObject entryRuleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -7484,8 +7769,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2634:56: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
-            // InternalMenuDsl.g:2635:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
+            // InternalMenuDsl.g:2734:56: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
+            // InternalMenuDsl.g:2735:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXUnaryOperationRule()); 
@@ -7516,7 +7801,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // InternalMenuDsl.g:2641:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
+    // InternalMenuDsl.g:2741: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;
 
@@ -7529,35 +7814,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2647:2: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
-            // InternalMenuDsl.g:2648:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalMenuDsl.g:2747:2: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
+            // InternalMenuDsl.g:2748:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             {
-            // InternalMenuDsl.g:2648:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
-            int alt49=2;
-            int LA49_0 = input.LA(1);
+            // InternalMenuDsl.g:2748:2: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            int alt47=2;
+            int LA47_0 = input.LA(1);
 
-            if ( ((LA49_0>=67 && LA49_0<=68)||LA49_0==72) ) {
-                alt49=1;
+            if ( ((LA47_0>=69 && LA47_0<=70)||LA47_0==74) ) {
+                alt47=1;
             }
-            else if ( ((LA49_0>=RULE_STRING && LA49_0<=RULE_DECIMAL)||LA49_0==14||(LA49_0>=32 && LA49_0<=34)||LA49_0==39||(LA49_0>=43 && LA49_0<=44)||LA49_0==51||LA49_0==80||LA49_0==82||(LA49_0>=86 && LA49_0<=88)||(LA49_0>=91 && LA49_0<=100)||LA49_0==102) ) {
-                alt49=2;
+            else if ( ((LA47_0>=RULE_STRING && LA47_0<=RULE_DECIMAL)||LA47_0==26||(LA47_0>=34 && LA47_0<=36)||LA47_0==41||(LA47_0>=45 && LA47_0<=46)||LA47_0==53||LA47_0==82||LA47_0==84||(LA47_0>=88 && LA47_0<=90)||(LA47_0>=93 && LA47_0<=102)||LA47_0==104) ) {
+                alt47=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 49, 0, input);
+                    new NoViableAltException("", 47, 0, input);
 
                 throw nvae;
             }
-            switch (alt49) {
+            switch (alt47) {
                 case 1 :
-                    // InternalMenuDsl.g:2649:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalMenuDsl.g:2749:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
                     {
-                    // InternalMenuDsl.g:2649:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
-                    // InternalMenuDsl.g:2650:4: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalMenuDsl.g:2749:3: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalMenuDsl.g:2750:4: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
                     {
-                    // InternalMenuDsl.g:2650:4: ()
-                    // InternalMenuDsl.g:2651:5: 
+                    // InternalMenuDsl.g:2750:4: ()
+                    // InternalMenuDsl.g:2751:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7569,11 +7854,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:2657:4: ( ( ruleOpUnary ) )
-                    // InternalMenuDsl.g:2658:5: ( ruleOpUnary )
+                    // InternalMenuDsl.g:2757:4: ( ( ruleOpUnary ) )
+                    // InternalMenuDsl.g:2758:5: ( ruleOpUnary )
                     {
-                    // InternalMenuDsl.g:2658:5: ( ruleOpUnary )
-                    // InternalMenuDsl.g:2659:6: ruleOpUnary
+                    // InternalMenuDsl.g:2758:5: ( ruleOpUnary )
+                    // InternalMenuDsl.g:2759:6: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7587,7 +7872,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       						newCompositeNode(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_27);
+                    pushFollow(FOLLOW_28);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -7603,11 +7888,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:2673:4: ( (lv_operand_2_0= ruleXUnaryOperation ) )
-                    // InternalMenuDsl.g:2674:5: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalMenuDsl.g:2773:4: ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalMenuDsl.g:2774:5: (lv_operand_2_0= ruleXUnaryOperation )
                     {
-                    // InternalMenuDsl.g:2674:5: (lv_operand_2_0= ruleXUnaryOperation )
-                    // InternalMenuDsl.g:2675:6: lv_operand_2_0= ruleXUnaryOperation
+                    // InternalMenuDsl.g:2774:5: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalMenuDsl.g:2775:6: lv_operand_2_0= ruleXUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7645,7 +7930,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2694:3: this_XCastedExpression_3= ruleXCastedExpression
+                    // InternalMenuDsl.g:2794:3: this_XCastedExpression_3= ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7691,7 +7976,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // InternalMenuDsl.g:2706:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
+    // InternalMenuDsl.g:2806:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
     public final String entryRuleOpUnary() throws RecognitionException {
         String current = null;
 
@@ -7699,8 +7984,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2706:47: (iv_ruleOpUnary= ruleOpUnary EOF )
-            // InternalMenuDsl.g:2707:2: iv_ruleOpUnary= ruleOpUnary EOF
+            // InternalMenuDsl.g:2806:47: (iv_ruleOpUnary= ruleOpUnary EOF )
+            // InternalMenuDsl.g:2807:2: iv_ruleOpUnary= ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpUnaryRule()); 
@@ -7731,7 +8016,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpUnary"
-    // InternalMenuDsl.g:2713:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
+    // InternalMenuDsl.g:2813:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
     public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7741,40 +8026,40 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2719:2: ( (kw= '!' | kw= '-' | kw= '+' ) )
-            // InternalMenuDsl.g:2720:2: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalMenuDsl.g:2819:2: ( (kw= '!' | kw= '-' | kw= '+' ) )
+            // InternalMenuDsl.g:2820:2: (kw= '!' | kw= '-' | kw= '+' )
             {
-            // InternalMenuDsl.g:2720:2: (kw= '!' | kw= '-' | kw= '+' )
-            int alt50=3;
+            // InternalMenuDsl.g:2820:2: (kw= '!' | kw= '-' | kw= '+' )
+            int alt48=3;
             switch ( input.LA(1) ) {
-            case 72:
+            case 74:
                 {
-                alt50=1;
+                alt48=1;
                 }
                 break;
-            case 68:
+            case 70:
                 {
-                alt50=2;
+                alt48=2;
                 }
                 break;
-            case 67:
+            case 69:
                 {
-                alt50=3;
+                alt48=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 50, 0, input);
+                    new NoViableAltException("", 48, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt50) {
+            switch (alt48) {
                 case 1 :
-                    // InternalMenuDsl.g:2721:3: kw= '!'
+                    // InternalMenuDsl.g:2821:3: kw= '!'
                     {
-                    kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7785,9 +8070,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2727:3: kw= '-'
+                    // InternalMenuDsl.g:2827:3: kw= '-'
                     {
-                    kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,70,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7798,9 +8083,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:2733:3: kw= '+'
+                    // InternalMenuDsl.g:2833:3: kw= '+'
                     {
-                    kw=(Token)match(input,67,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -7835,7 +8120,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // InternalMenuDsl.g:2742:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
+    // InternalMenuDsl.g:2842:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
     public final EObject entryRuleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7843,8 +8128,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2742:58: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
-            // InternalMenuDsl.g:2743:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
+            // InternalMenuDsl.g:2842:58: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
+            // InternalMenuDsl.g:2843:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCastedExpressionRule()); 
@@ -7875,7 +8160,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // InternalMenuDsl.g:2749:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
+    // InternalMenuDsl.g:2849: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;
 
@@ -7889,18 +8174,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2755:2: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
-            // InternalMenuDsl.g:2756:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalMenuDsl.g:2855:2: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
+            // InternalMenuDsl.g:2856:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
             {
-            // InternalMenuDsl.g:2756:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
-            // InternalMenuDsl.g:2757:3: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalMenuDsl.g:2856:2: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalMenuDsl.g:2857: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_47);
+            pushFollow(FOLLOW_48);
             this_XPostfixOperation_0=ruleXPostfixOperation();
 
             state._fsp--;
@@ -7911,35 +8196,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:2765:3: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
-            loop51:
+            // InternalMenuDsl.g:2865:3: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            loop49:
             do {
-                int alt51=2;
-                int LA51_0 = input.LA(1);
+                int alt49=2;
+                int LA49_0 = input.LA(1);
 
-                if ( (LA51_0==73) ) {
-                    int LA51_2 = input.LA(2);
+                if ( (LA49_0==75) ) {
+                    int LA49_2 = input.LA(2);
 
                     if ( (synpred18_InternalMenuDsl()) ) {
-                        alt51=1;
+                        alt49=1;
                     }
 
 
                 }
 
 
-                switch (alt51) {
+                switch (alt49) {
             	case 1 :
-            	    // InternalMenuDsl.g:2766:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalMenuDsl.g:2866:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // InternalMenuDsl.g:2766:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
-            	    // InternalMenuDsl.g:2767:5: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
+            	    // InternalMenuDsl.g:2866:4: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
+            	    // InternalMenuDsl.g:2867:5: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
             	    {
-            	    // InternalMenuDsl.g:2773:5: ( () otherlv_2= 'as' )
-            	    // InternalMenuDsl.g:2774:6: () otherlv_2= 'as'
+            	    // InternalMenuDsl.g:2873:5: ( () otherlv_2= 'as' )
+            	    // InternalMenuDsl.g:2874:6: () otherlv_2= 'as'
             	    {
-            	    // InternalMenuDsl.g:2774:6: ()
-            	    // InternalMenuDsl.g:2775:7: 
+            	    // InternalMenuDsl.g:2874:6: ()
+            	    // InternalMenuDsl.g:2875:7: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7951,7 +8236,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,73,FOLLOW_40); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,75,FOLLOW_41); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      						newLeafNode(otherlv_2, grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1());
@@ -7963,18 +8248,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2787:4: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // InternalMenuDsl.g:2788:5: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalMenuDsl.g:2887:4: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalMenuDsl.g:2888:5: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // InternalMenuDsl.g:2788:5: (lv_type_3_0= ruleJvmTypeReference )
-            	    // InternalMenuDsl.g:2789:6: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalMenuDsl.g:2888:5: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalMenuDsl.g:2889:6: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      						newCompositeNode(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0());
             	      					
             	    }
-            	    pushFollow(FOLLOW_47);
+            	    pushFollow(FOLLOW_48);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -8003,7 +8288,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop51;
+            	    break loop49;
                 }
             } while (true);
 
@@ -8032,7 +8317,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // InternalMenuDsl.g:2811:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
+    // InternalMenuDsl.g:2911:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
     public final EObject entryRuleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -8040,8 +8325,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2811:58: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
-            // InternalMenuDsl.g:2812:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
+            // InternalMenuDsl.g:2911:58: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
+            // InternalMenuDsl.g:2912:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPostfixOperationRule()); 
@@ -8072,7 +8357,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // InternalMenuDsl.g:2818:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
+    // InternalMenuDsl.g:2918:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
     public final EObject ruleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -8083,18 +8368,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2824:2: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
-            // InternalMenuDsl.g:2825:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalMenuDsl.g:2924:2: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
+            // InternalMenuDsl.g:2925:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
             {
-            // InternalMenuDsl.g:2825:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
-            // InternalMenuDsl.g:2826:3: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalMenuDsl.g:2925:2: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalMenuDsl.g:2926:3: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             {
             if ( state.backtracking==0 ) {
 
               			newCompositeNode(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0());
               		
             }
-            pushFollow(FOLLOW_48);
+            pushFollow(FOLLOW_49);
             this_XMemberFeatureCall_0=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -8105,33 +8390,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:2834:3: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
-            int alt52=2;
-            int LA52_0 = input.LA(1);
+            // InternalMenuDsl.g:2934:3: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            int alt50=2;
+            int LA50_0 = input.LA(1);
 
-            if ( (LA52_0==74) ) {
-                int LA52_1 = input.LA(2);
+            if ( (LA50_0==76) ) {
+                int LA50_1 = input.LA(2);
 
                 if ( (synpred19_InternalMenuDsl()) ) {
-                    alt52=1;
+                    alt50=1;
                 }
             }
-            else if ( (LA52_0==75) ) {
-                int LA52_2 = input.LA(2);
+            else if ( (LA50_0==77) ) {
+                int LA50_2 = input.LA(2);
 
                 if ( (synpred19_InternalMenuDsl()) ) {
-                    alt52=1;
+                    alt50=1;
                 }
             }
-            switch (alt52) {
+            switch (alt50) {
                 case 1 :
-                    // InternalMenuDsl.g:2835:4: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
+                    // InternalMenuDsl.g:2935:4: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
                     {
-                    // InternalMenuDsl.g:2845:4: ( () ( ( ruleOpPostfix ) ) )
-                    // InternalMenuDsl.g:2846:5: () ( ( ruleOpPostfix ) )
+                    // InternalMenuDsl.g:2945:4: ( () ( ( ruleOpPostfix ) ) )
+                    // InternalMenuDsl.g:2946:5: () ( ( ruleOpPostfix ) )
                     {
-                    // InternalMenuDsl.g:2846:5: ()
-                    // InternalMenuDsl.g:2847:6: 
+                    // InternalMenuDsl.g:2946:5: ()
+                    // InternalMenuDsl.g:2947:6: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -8143,11 +8428,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:2853:5: ( ( ruleOpPostfix ) )
-                    // InternalMenuDsl.g:2854:6: ( ruleOpPostfix )
+                    // InternalMenuDsl.g:2953:5: ( ( ruleOpPostfix ) )
+                    // InternalMenuDsl.g:2954:6: ( ruleOpPostfix )
                     {
-                    // InternalMenuDsl.g:2854:6: ( ruleOpPostfix )
-                    // InternalMenuDsl.g:2855:7: ruleOpPostfix
+                    // InternalMenuDsl.g:2954:6: ( ruleOpPostfix )
+                    // InternalMenuDsl.g:2955:7: ruleOpPostfix
                     {
                     if ( state.backtracking==0 ) {
 
@@ -8211,7 +8496,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // InternalMenuDsl.g:2875:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
+    // InternalMenuDsl.g:2975:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
     public final String entryRuleOpPostfix() throws RecognitionException {
         String current = null;
 
@@ -8219,8 +8504,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2875:49: (iv_ruleOpPostfix= ruleOpPostfix EOF )
-            // InternalMenuDsl.g:2876:2: iv_ruleOpPostfix= ruleOpPostfix EOF
+            // InternalMenuDsl.g:2975:49: (iv_ruleOpPostfix= ruleOpPostfix EOF )
+            // InternalMenuDsl.g:2976:2: iv_ruleOpPostfix= ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpPostfixRule()); 
@@ -8251,7 +8536,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // InternalMenuDsl.g:2882:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
+    // InternalMenuDsl.g:2982:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
     public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8261,31 +8546,31 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2888:2: ( (kw= '++' | kw= '--' ) )
-            // InternalMenuDsl.g:2889:2: (kw= '++' | kw= '--' )
+            // InternalMenuDsl.g:2988:2: ( (kw= '++' | kw= '--' ) )
+            // InternalMenuDsl.g:2989:2: (kw= '++' | kw= '--' )
             {
-            // InternalMenuDsl.g:2889:2: (kw= '++' | kw= '--' )
-            int alt53=2;
-            int LA53_0 = input.LA(1);
+            // InternalMenuDsl.g:2989:2: (kw= '++' | kw= '--' )
+            int alt51=2;
+            int LA51_0 = input.LA(1);
 
-            if ( (LA53_0==74) ) {
-                alt53=1;
+            if ( (LA51_0==76) ) {
+                alt51=1;
             }
-            else if ( (LA53_0==75) ) {
-                alt53=2;
+            else if ( (LA51_0==77) ) {
+                alt51=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 53, 0, input);
+                    new NoViableAltException("", 51, 0, input);
 
                 throw nvae;
             }
-            switch (alt53) {
+            switch (alt51) {
                 case 1 :
-                    // InternalMenuDsl.g:2890:3: kw= '++'
+                    // InternalMenuDsl.g:2990:3: kw= '++'
                     {
-                    kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,76,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -8296,9 +8581,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:2896:3: kw= '--'
+                    // InternalMenuDsl.g:2996:3: kw= '--'
                     {
-                    kw=(Token)match(input,75,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -8333,7 +8618,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // InternalMenuDsl.g:2905:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
+    // InternalMenuDsl.g:3005:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
     public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -8341,8 +8626,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:2905:59: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
-            // InternalMenuDsl.g:2906:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
+            // InternalMenuDsl.g:3005:59: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
+            // InternalMenuDsl.g:3006:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMemberFeatureCallRule()); 
@@ -8373,7 +8658,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // InternalMenuDsl.g:2912: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 ) )? ) )* ) ;
+    // InternalMenuDsl.g:3012: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;
 
@@ -8409,18 +8694,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:2918: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 ) )? ) )* ) )
-            // InternalMenuDsl.g:2919: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 ) )? ) )* )
+            // InternalMenuDsl.g:3018: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 ) )? ) )* ) )
+            // InternalMenuDsl.g:3019: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 ) )? ) )* )
             {
-            // InternalMenuDsl.g:2919: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 ) )? ) )* )
-            // InternalMenuDsl.g:2920: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 ) )? ) )*
+            // InternalMenuDsl.g:3019: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 ) )? ) )* )
+            // InternalMenuDsl.g:3020: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_49);
+            pushFollow(FOLLOW_50);
             this_XPrimaryExpression_0=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -8431,45 +8716,45 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:2928: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 ) )? ) )*
-            loop62:
+            // InternalMenuDsl.g:3028: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 ) )? ) )*
+            loop60:
             do {
-                int alt62=3;
+                int alt60=3;
                 switch ( input.LA(1) ) {
-                case 76:
+                case 78:
                     {
-                    int LA62_2 = input.LA(2);
+                    int LA60_2 = input.LA(2);
 
                     if ( (synpred20_InternalMenuDsl()) ) {
-                        alt62=1;
+                        alt60=1;
                     }
                     else if ( (synpred21_InternalMenuDsl()) ) {
-                        alt62=2;
+                        alt60=2;
                     }
 
 
                     }
                     break;
-                case 77:
+                case 79:
                     {
-                    int LA62_3 = input.LA(2);
+                    int LA60_3 = input.LA(2);
 
                     if ( (synpred20_InternalMenuDsl()) ) {
-                        alt62=1;
+                        alt60=1;
                     }
                     else if ( (synpred21_InternalMenuDsl()) ) {
-                        alt62=2;
+                        alt60=2;
                     }
 
 
                     }
                     break;
-                case 78:
+                case 80:
                     {
-                    int LA62_4 = input.LA(2);
+                    int LA60_4 = input.LA(2);
 
                     if ( (synpred21_InternalMenuDsl()) ) {
-                        alt62=2;
+                        alt60=2;
                     }
 
 
@@ -8478,21 +8763,21 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                switch (alt62) {
+                switch (alt60) {
             	case 1 :
-            	    // InternalMenuDsl.g:2929:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalMenuDsl.g:3029:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
             	    {
-            	    // InternalMenuDsl.g:2929:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
-            	    // InternalMenuDsl.g:2930:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalMenuDsl.g:3029:4: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalMenuDsl.g:3030:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
             	    {
-            	    // InternalMenuDsl.g:2930:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-            	    // InternalMenuDsl.g:2931:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalMenuDsl.g:3030:5: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+            	    // InternalMenuDsl.g:3031:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
             	    {
-            	    // InternalMenuDsl.g:2951:6: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-            	    // InternalMenuDsl.g:2952:7: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+            	    // InternalMenuDsl.g:3051:6: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalMenuDsl.g:3052:7: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
             	    {
-            	    // InternalMenuDsl.g:2952:7: ()
-            	    // InternalMenuDsl.g:2953:8: 
+            	    // InternalMenuDsl.g:3052:7: ()
+            	    // InternalMenuDsl.g:3053:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8504,28 +8789,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2959:7: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
-            	    int alt54=2;
-            	    int LA54_0 = input.LA(1);
+            	    // InternalMenuDsl.g:3059:7: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
+            	    int alt52=2;
+            	    int LA52_0 = input.LA(1);
 
-            	    if ( (LA54_0==76) ) {
-            	        alt54=1;
+            	    if ( (LA52_0==78) ) {
+            	        alt52=1;
             	    }
-            	    else if ( (LA54_0==77) ) {
-            	        alt54=2;
+            	    else if ( (LA52_0==79) ) {
+            	        alt52=2;
             	    }
             	    else {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("", 54, 0, input);
+            	            new NoViableAltException("", 52, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt54) {
+            	    switch (alt52) {
             	        case 1 :
-            	            // InternalMenuDsl.g:2960:8: otherlv_2= '.'
+            	            // InternalMenuDsl.g:3060:8: otherlv_2= '.'
             	            {
-            	            otherlv_2=(Token)match(input,76,FOLLOW_50); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,78,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              								newLeafNode(otherlv_2, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0());
@@ -8535,15 +8820,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	            }
             	            break;
             	        case 2 :
-            	            // InternalMenuDsl.g:2965:8: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalMenuDsl.g:3065:8: ( (lv_explicitStatic_3_0= '::' ) )
             	            {
-            	            // InternalMenuDsl.g:2965:8: ( (lv_explicitStatic_3_0= '::' ) )
-            	            // InternalMenuDsl.g:2966:9: (lv_explicitStatic_3_0= '::' )
+            	            // InternalMenuDsl.g:3065:8: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalMenuDsl.g:3066:9: (lv_explicitStatic_3_0= '::' )
             	            {
-            	            // InternalMenuDsl.g:2966:9: (lv_explicitStatic_3_0= '::' )
-            	            // InternalMenuDsl.g:2967:10: lv_explicitStatic_3_0= '::'
+            	            // InternalMenuDsl.g:3066:9: (lv_explicitStatic_3_0= '::' )
+            	            // InternalMenuDsl.g:3067:10: lv_explicitStatic_3_0= '::'
             	            {
-            	            lv_explicitStatic_3_0=(Token)match(input,77,FOLLOW_50); if (state.failed) return current;
+            	            lv_explicitStatic_3_0=(Token)match(input,79,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              										newLeafNode(lv_explicitStatic_3_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0());
@@ -8569,11 +8854,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:2980:7: ( ( ruleFeatureCallID ) )
-            	    // InternalMenuDsl.g:2981:8: ( ruleFeatureCallID )
+            	    // InternalMenuDsl.g:3080:7: ( ( ruleFeatureCallID ) )
+            	    // InternalMenuDsl.g:3081:8: ( ruleFeatureCallID )
             	    {
-            	    // InternalMenuDsl.g:2981:8: ( ruleFeatureCallID )
-            	    // InternalMenuDsl.g:2982:9: ruleFeatureCallID
+            	    // InternalMenuDsl.g:3081:8: ( ruleFeatureCallID )
+            	    // InternalMenuDsl.g:3082:9: ruleFeatureCallID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8587,7 +8872,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      									newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0());
             	      								
             	    }
-            	    pushFollow(FOLLOW_26);
+            	    pushFollow(FOLLOW_27);
             	    ruleFeatureCallID();
 
             	    state._fsp--;
@@ -8608,7 +8893,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3());
             	      						
             	    }
-            	    pushFollow(FOLLOW_27);
+            	    pushFollow(FOLLOW_28);
             	    ruleOpSingleAssign();
 
             	    state._fsp--;
@@ -8624,18 +8909,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:3005:5: ( (lv_value_6_0= ruleXAssignment ) )
-            	    // InternalMenuDsl.g:3006:6: (lv_value_6_0= ruleXAssignment )
+            	    // InternalMenuDsl.g:3105:5: ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalMenuDsl.g:3106:6: (lv_value_6_0= ruleXAssignment )
             	    {
-            	    // InternalMenuDsl.g:3006:6: (lv_value_6_0= ruleXAssignment )
-            	    // InternalMenuDsl.g:3007:7: lv_value_6_0= ruleXAssignment
+            	    // InternalMenuDsl.g:3106:6: (lv_value_6_0= ruleXAssignment )
+            	    // InternalMenuDsl.g:3107:7: lv_value_6_0= ruleXAssignment
             	    {
             	    if ( state.backtracking==0 ) {
 
             	      							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_49);
+            	    pushFollow(FOLLOW_50);
             	    lv_value_6_0=ruleXAssignment();
 
             	    state._fsp--;
@@ -8666,19 +8951,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    }
             	    break;
             	case 2 :
-            	    // InternalMenuDsl.g:3026: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 ) )? )
+            	    // InternalMenuDsl.g:3126: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 ) )? )
             	    {
-            	    // InternalMenuDsl.g:3026: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 ) )? )
-            	    // InternalMenuDsl.g:3027: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 ) )?
+            	    // InternalMenuDsl.g:3126: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 ) )? )
+            	    // InternalMenuDsl.g:3127: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 ) )?
             	    {
-            	    // InternalMenuDsl.g:3027:5: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
-            	    // InternalMenuDsl.g:3028:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalMenuDsl.g:3127:5: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
+            	    // InternalMenuDsl.g:3128:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
             	    {
-            	    // InternalMenuDsl.g:3048:6: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
-            	    // InternalMenuDsl.g:3049:7: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalMenuDsl.g:3148:6: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalMenuDsl.g:3149:7: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    {
-            	    // InternalMenuDsl.g:3049:7: ()
-            	    // InternalMenuDsl.g:3050:8: 
+            	    // InternalMenuDsl.g:3149:7: ()
+            	    // InternalMenuDsl.g:3150:8: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8690,37 +8975,37 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:3056:7: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
-            	    int alt55=3;
+            	    // InternalMenuDsl.g:3156:7: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    int alt53=3;
             	    switch ( input.LA(1) ) {
-            	    case 76:
+            	    case 78:
             	        {
-            	        alt55=1;
+            	        alt53=1;
             	        }
             	        break;
-            	    case 78:
+            	    case 80:
             	        {
-            	        alt55=2;
+            	        alt53=2;
             	        }
             	        break;
-            	    case 77:
+            	    case 79:
             	        {
-            	        alt55=3;
+            	        alt53=3;
             	        }
             	        break;
             	    default:
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("", 55, 0, input);
+            	            new NoViableAltException("", 53, 0, input);
 
             	        throw nvae;
             	    }
 
-            	    switch (alt55) {
+            	    switch (alt53) {
             	        case 1 :
-            	            // InternalMenuDsl.g:3057:8: otherlv_8= '.'
+            	            // InternalMenuDsl.g:3157:8: otherlv_8= '.'
             	            {
-            	            otherlv_8=(Token)match(input,76,FOLLOW_51); if (state.failed) return current;
+            	            otherlv_8=(Token)match(input,78,FOLLOW_52); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              								newLeafNode(otherlv_8, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0());
@@ -8730,15 +9015,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	            }
             	            break;
             	        case 2 :
-            	            // InternalMenuDsl.g:3062:8: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalMenuDsl.g:3162:8: ( (lv_nullSafe_9_0= '?.' ) )
             	            {
-            	            // InternalMenuDsl.g:3062:8: ( (lv_nullSafe_9_0= '?.' ) )
-            	            // InternalMenuDsl.g:3063:9: (lv_nullSafe_9_0= '?.' )
+            	            // InternalMenuDsl.g:3162:8: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalMenuDsl.g:3163:9: (lv_nullSafe_9_0= '?.' )
             	            {
-            	            // InternalMenuDsl.g:3063:9: (lv_nullSafe_9_0= '?.' )
-            	            // InternalMenuDsl.g:3064:10: lv_nullSafe_9_0= '?.'
+            	            // InternalMenuDsl.g:3163:9: (lv_nullSafe_9_0= '?.' )
+            	            // InternalMenuDsl.g:3164:10: lv_nullSafe_9_0= '?.'
             	            {
-            	            lv_nullSafe_9_0=(Token)match(input,78,FOLLOW_51); if (state.failed) return current;
+            	            lv_nullSafe_9_0=(Token)match(input,80,FOLLOW_52); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              										newLeafNode(lv_nullSafe_9_0, grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0());
@@ -8762,15 +9047,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	            }
             	            break;
             	        case 3 :
-            	            // InternalMenuDsl.g:3077:8: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalMenuDsl.g:3177:8: ( (lv_explicitStatic_10_0= '::' ) )
             	            {
-            	            // InternalMenuDsl.g:3077:8: ( (lv_explicitStatic_10_0= '::' ) )
-            	            // InternalMenuDsl.g:3078:9: (lv_explicitStatic_10_0= '::' )
+            	            // InternalMenuDsl.g:3177:8: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalMenuDsl.g:3178:9: (lv_explicitStatic_10_0= '::' )
             	            {
-            	            // InternalMenuDsl.g:3078:9: (lv_explicitStatic_10_0= '::' )
-            	            // InternalMenuDsl.g:3079:10: lv_explicitStatic_10_0= '::'
+            	            // InternalMenuDsl.g:3178:9: (lv_explicitStatic_10_0= '::' )
+            	            // InternalMenuDsl.g:3179:10: lv_explicitStatic_10_0= '::'
             	            {
-            	            lv_explicitStatic_10_0=(Token)match(input,77,FOLLOW_51); if (state.failed) return current;
+            	            lv_explicitStatic_10_0=(Token)match(input,79,FOLLOW_52); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              										newLeafNode(lv_explicitStatic_10_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0());
@@ -8802,35 +9087,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:3094:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
-            	    int alt57=2;
-            	    int LA57_0 = input.LA(1);
+            	    // InternalMenuDsl.g:3194:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
+            	    int alt55=2;
+            	    int LA55_0 = input.LA(1);
 
-            	    if ( (LA57_0==51) ) {
-            	        alt57=1;
+            	    if ( (LA55_0==53) ) {
+            	        alt55=1;
             	    }
-            	    switch (alt57) {
+            	    switch (alt55) {
             	        case 1 :
-            	            // InternalMenuDsl.g:3095:6: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
+            	            // InternalMenuDsl.g:3195:6: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
             	            {
-            	            otherlv_11=(Token)match(input,51,FOLLOW_52); if (state.failed) return current;
+            	            otherlv_11=(Token)match(input,53,FOLLOW_53); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              						newLeafNode(otherlv_11, grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0());
             	              					
             	            }
-            	            // InternalMenuDsl.g:3099:6: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
-            	            // InternalMenuDsl.g:3100:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalMenuDsl.g:3199:6: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
+            	            // InternalMenuDsl.g:3200:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
             	            {
-            	            // InternalMenuDsl.g:3100:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
-            	            // InternalMenuDsl.g:3101:8: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
+            	            // InternalMenuDsl.g:3200:7: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalMenuDsl.g:3201:8: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
             	            {
             	            if ( state.backtracking==0 ) {
 
             	              								newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0());
             	              							
             	            }
-            	            pushFollow(FOLLOW_53);
+            	            pushFollow(FOLLOW_54);
             	            lv_typeArguments_12_0=ruleJvmArgumentTypeReference();
 
             	            state._fsp--;
@@ -8854,39 +9139,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	            }
 
-            	            // InternalMenuDsl.g:3118:6: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
-            	            loop56:
+            	            // InternalMenuDsl.g:3218:6: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
+            	            loop54:
             	            do {
-            	                int alt56=2;
-            	                int LA56_0 = input.LA(1);
+            	                int alt54=2;
+            	                int LA54_0 = input.LA(1);
 
-            	                if ( (LA56_0==40) ) {
-            	                    alt56=1;
+            	                if ( (LA54_0==42) ) {
+            	                    alt54=1;
             	                }
 
 
-            	                switch (alt56) {
+            	                switch (alt54) {
             	            	case 1 :
-            	            	    // InternalMenuDsl.g:3119:7: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalMenuDsl.g:3219:7: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
             	            	    {
-            	            	    otherlv_13=(Token)match(input,40,FOLLOW_52); if (state.failed) return current;
+            	            	    otherlv_13=(Token)match(input,42,FOLLOW_53); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	      							newLeafNode(otherlv_13, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0());
             	            	      						
             	            	    }
-            	            	    // InternalMenuDsl.g:3123:7: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
-            	            	    // InternalMenuDsl.g:3124:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalMenuDsl.g:3223:7: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalMenuDsl.g:3224:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
             	            	    {
-            	            	    // InternalMenuDsl.g:3124:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
-            	            	    // InternalMenuDsl.g:3125:9: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
+            	            	    // InternalMenuDsl.g:3224:8: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalMenuDsl.g:3225:9: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
             	            	    {
             	            	    if ( state.backtracking==0 ) {
 
             	            	      									newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0());
             	            	      								
             	            	    }
-            	            	    pushFollow(FOLLOW_53);
+            	            	    pushFollow(FOLLOW_54);
             	            	    lv_typeArguments_14_0=ruleJvmArgumentTypeReference();
 
             	            	    state._fsp--;
@@ -8915,11 +9200,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	            	    break;
 
             	            	default :
-            	            	    break loop56;
+            	            	    break loop54;
             	                }
             	            } while (true);
 
-            	            otherlv_15=(Token)match(input,52,FOLLOW_51); if (state.failed) return current;
+            	            otherlv_15=(Token)match(input,54,FOLLOW_52); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              						newLeafNode(otherlv_15, grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3());
@@ -8931,11 +9216,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:3148:5: ( ( ruleIdOrSuper ) )
-            	    // InternalMenuDsl.g:3149:6: ( ruleIdOrSuper )
+            	    // InternalMenuDsl.g:3248:5: ( ( ruleIdOrSuper ) )
+            	    // InternalMenuDsl.g:3249:6: ( ruleIdOrSuper )
             	    {
-            	    // InternalMenuDsl.g:3149:6: ( ruleIdOrSuper )
-            	    // InternalMenuDsl.g:3150:7: ruleIdOrSuper
+            	    // InternalMenuDsl.g:3249:6: ( ruleIdOrSuper )
+            	    // InternalMenuDsl.g:3250:7: ruleIdOrSuper
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8949,7 +9234,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0());
             	      						
             	    }
-            	    pushFollow(FOLLOW_54);
+            	    pushFollow(FOLLOW_55);
             	    ruleIdOrSuper();
 
             	    state._fsp--;
@@ -8965,20 +9250,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:3164: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 alt60=2;
-            	    alt60 = dfa60.predict(input);
-            	    switch (alt60) {
+            	    // InternalMenuDsl.g:3264: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 alt58=2;
+            	    alt58 = dfa58.predict(input);
+            	    switch (alt58) {
             	        case 1 :
-            	            // InternalMenuDsl.g:3165: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= ')'
+            	            // InternalMenuDsl.g:3265: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= ')'
             	            {
-            	            // InternalMenuDsl.g:3165:6: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
-            	            // InternalMenuDsl.g:3166:7: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalMenuDsl.g:3265:6: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
+            	            // InternalMenuDsl.g:3266:7: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
             	            {
-            	            // InternalMenuDsl.g:3170:7: (lv_explicitOperationCall_17_0= '(' )
-            	            // InternalMenuDsl.g:3171:8: lv_explicitOperationCall_17_0= '('
+            	            // InternalMenuDsl.g:3270:7: (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalMenuDsl.g:3271:8: lv_explicitOperationCall_17_0= '('
             	            {
-            	            lv_explicitOperationCall_17_0=(Token)match(input,39,FOLLOW_55); if (state.failed) return current;
+            	            lv_explicitOperationCall_17_0=(Token)match(input,41,FOLLOW_56); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              								newLeafNode(lv_explicitOperationCall_17_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0());
@@ -8998,25 +9283,25 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	            }
 
-            	            // InternalMenuDsl.g:3183:6: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
-            	            int alt59=3;
-            	            alt59 = dfa59.predict(input);
-            	            switch (alt59) {
+            	            // InternalMenuDsl.g:3283:6: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
+            	            int alt57=3;
+            	            alt57 = dfa57.predict(input);
+            	            switch (alt57) {
             	                case 1 :
-            	                    // InternalMenuDsl.g:3184:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalMenuDsl.g:3284:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
             	                    {
-            	                    // InternalMenuDsl.g:3184:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
-            	                    // InternalMenuDsl.g:3185:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalMenuDsl.g:3284:7: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalMenuDsl.g:3285:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
             	                    {
-            	                    // InternalMenuDsl.g:3210:8: (lv_memberCallArguments_18_0= ruleXShortClosure )
-            	                    // InternalMenuDsl.g:3211:9: lv_memberCallArguments_18_0= ruleXShortClosure
+            	                    // InternalMenuDsl.g:3310:8: (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalMenuDsl.g:3311:9: lv_memberCallArguments_18_0= ruleXShortClosure
             	                    {
             	                    if ( state.backtracking==0 ) {
 
             	                      									newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0());
             	                      								
             	                    }
-            	                    pushFollow(FOLLOW_25);
+            	                    pushFollow(FOLLOW_26);
             	                    lv_memberCallArguments_18_0=ruleXShortClosure();
 
             	                    state._fsp--;
@@ -9044,23 +9329,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	                    }
             	                    break;
             	                case 2 :
-            	                    // InternalMenuDsl.g:3229:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalMenuDsl.g:3329:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
             	                    {
-            	                    // InternalMenuDsl.g:3229:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
-            	                    // InternalMenuDsl.g:3230:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalMenuDsl.g:3329:7: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalMenuDsl.g:3330:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    {
-            	                    // InternalMenuDsl.g:3230:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
-            	                    // InternalMenuDsl.g:3231:9: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalMenuDsl.g:3330:8: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
+            	                    // InternalMenuDsl.g:3331:9: (lv_memberCallArguments_19_0= ruleXExpression )
             	                    {
-            	                    // InternalMenuDsl.g:3231:9: (lv_memberCallArguments_19_0= ruleXExpression )
-            	                    // InternalMenuDsl.g:3232:10: lv_memberCallArguments_19_0= ruleXExpression
+            	                    // InternalMenuDsl.g:3331:9: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalMenuDsl.g:3332:10: lv_memberCallArguments_19_0= ruleXExpression
             	                    {
             	                    if ( state.backtracking==0 ) {
 
             	                      										newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0());
             	                      									
             	                    }
-            	                    pushFollow(FOLLOW_24);
+            	                    pushFollow(FOLLOW_25);
             	                    lv_memberCallArguments_19_0=ruleXExpression();
 
             	                    state._fsp--;
@@ -9084,39 +9369,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	                    }
 
-            	                    // InternalMenuDsl.g:3249:8: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
-            	                    loop58:
+            	                    // InternalMenuDsl.g:3349:8: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    loop56:
             	                    do {
-            	                        int alt58=2;
-            	                        int LA58_0 = input.LA(1);
+            	                        int alt56=2;
+            	                        int LA56_0 = input.LA(1);
 
-            	                        if ( (LA58_0==40) ) {
-            	                            alt58=1;
+            	                        if ( (LA56_0==42) ) {
+            	                            alt56=1;
             	                        }
 
 
-            	                        switch (alt58) {
+            	                        switch (alt56) {
             	                    	case 1 :
-            	                    	    // InternalMenuDsl.g:3250:9: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalMenuDsl.g:3350:9: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
             	                    	    {
-            	                    	    otherlv_20=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+            	                    	    otherlv_20=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	      									newLeafNode(otherlv_20, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0());
             	                    	      								
             	                    	    }
-            	                    	    // InternalMenuDsl.g:3254:9: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
-            	                    	    // InternalMenuDsl.g:3255:10: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalMenuDsl.g:3354:9: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalMenuDsl.g:3355:10: (lv_memberCallArguments_21_0= ruleXExpression )
             	                    	    {
-            	                    	    // InternalMenuDsl.g:3255:10: (lv_memberCallArguments_21_0= ruleXExpression )
-            	                    	    // InternalMenuDsl.g:3256:11: lv_memberCallArguments_21_0= ruleXExpression
+            	                    	    // InternalMenuDsl.g:3355:10: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalMenuDsl.g:3356:11: lv_memberCallArguments_21_0= ruleXExpression
             	                    	    {
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	      											newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0());
             	                    	      										
             	                    	    }
-            	                    	    pushFollow(FOLLOW_24);
+            	                    	    pushFollow(FOLLOW_25);
             	                    	    lv_memberCallArguments_21_0=ruleXExpression();
 
             	                    	    state._fsp--;
@@ -9145,7 +9430,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	                    	    break;
 
             	                    	default :
-            	                    	    break loop58;
+            	                    	    break loop56;
             	                        }
             	                    } while (true);
 
@@ -9158,7 +9443,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	            }
 
-            	            otherlv_22=(Token)match(input,41,FOLLOW_56); if (state.failed) return current;
+            	            otherlv_22=(Token)match(input,43,FOLLOW_57); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              						newLeafNode(otherlv_22, grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2());
@@ -9170,22 +9455,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:3281:5: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
-            	    int alt61=2;
-            	    alt61 = dfa61.predict(input);
-            	    switch (alt61) {
+            	    // InternalMenuDsl.g:3381:5: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    int alt59=2;
+            	    alt59 = dfa59.predict(input);
+            	    switch (alt59) {
             	        case 1 :
-            	            // InternalMenuDsl.g:3282:6: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalMenuDsl.g:3382:6: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
             	            {
-            	            // InternalMenuDsl.g:3288:6: (lv_memberCallArguments_23_0= ruleXClosure )
-            	            // InternalMenuDsl.g:3289:7: lv_memberCallArguments_23_0= ruleXClosure
+            	            // InternalMenuDsl.g:3388:6: (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalMenuDsl.g:3389:7: lv_memberCallArguments_23_0= ruleXClosure
             	            {
             	            if ( state.backtracking==0 ) {
 
             	              							newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0());
             	              						
             	            }
-            	            pushFollow(FOLLOW_49);
+            	            pushFollow(FOLLOW_50);
             	            lv_memberCallArguments_23_0=ruleXClosure();
 
             	            state._fsp--;
@@ -9220,7 +9505,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop62;
+            	    break loop60;
                 }
             } while (true);
 
@@ -9249,7 +9534,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // InternalMenuDsl.g:3312:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
+    // InternalMenuDsl.g:3412:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
     public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9257,8 +9542,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3312:59: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
-            // InternalMenuDsl.g:3313:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
+            // InternalMenuDsl.g:3412:59: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
+            // InternalMenuDsl.g:3413:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPrimaryExpressionRule()); 
@@ -9289,7 +9574,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // InternalMenuDsl.g:3319: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 ) ;
+    // InternalMenuDsl.g:3419: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;
 
@@ -9328,15 +9613,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3325: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 ) )
-            // InternalMenuDsl.g:3326: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 )
+            // InternalMenuDsl.g:3425: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 ) )
+            // InternalMenuDsl.g:3426: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 )
             {
-            // InternalMenuDsl.g:3326: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 alt63=15;
-            alt63 = dfa63.predict(input);
-            switch (alt63) {
+            // InternalMenuDsl.g:3426: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 alt61=15;
+            alt61 = dfa61.predict(input);
+            switch (alt61) {
                 case 1 :
-                    // InternalMenuDsl.g:3327:3: this_XConstructorCall_0= ruleXConstructorCall
+                    // InternalMenuDsl.g:3427:3: this_XConstructorCall_0= ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9358,7 +9643,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3336:3: this_XBlockExpression_1= ruleXBlockExpression
+                    // InternalMenuDsl.g:3436:3: this_XBlockExpression_1= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9380,7 +9665,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:3345:3: this_XSwitchExpression_2= ruleXSwitchExpression
+                    // InternalMenuDsl.g:3445:3: this_XSwitchExpression_2= ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9402,10 +9687,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:3354:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalMenuDsl.g:3454:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
                     {
-                    // InternalMenuDsl.g:3354:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
-                    // InternalMenuDsl.g:3355:4: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
+                    // InternalMenuDsl.g:3454:3: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalMenuDsl.g:3455:4: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9430,7 +9715,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:3372:3: this_XFeatureCall_4= ruleXFeatureCall
+                    // InternalMenuDsl.g:3472:3: this_XFeatureCall_4= ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9452,7 +9737,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:3381:3: this_XLiteral_5= ruleXLiteral
+                    // InternalMenuDsl.g:3481:3: this_XLiteral_5= ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9474,7 +9759,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:3390:3: this_XIfExpression_6= ruleXIfExpression
+                    // InternalMenuDsl.g:3490:3: this_XIfExpression_6= ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9496,10 +9781,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 8 :
-                    // InternalMenuDsl.g:3399:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalMenuDsl.g:3499:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
                     {
-                    // InternalMenuDsl.g:3399:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
-                    // InternalMenuDsl.g:3400:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
+                    // InternalMenuDsl.g:3499:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalMenuDsl.g:3500:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9524,7 +9809,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 9 :
-                    // InternalMenuDsl.g:3423:3: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
+                    // InternalMenuDsl.g:3523:3: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9546,7 +9831,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 10 :
-                    // InternalMenuDsl.g:3432:3: this_XWhileExpression_9= ruleXWhileExpression
+                    // InternalMenuDsl.g:3532:3: this_XWhileExpression_9= ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9568,7 +9853,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 11 :
-                    // InternalMenuDsl.g:3441:3: this_XDoWhileExpression_10= ruleXDoWhileExpression
+                    // InternalMenuDsl.g:3541:3: this_XDoWhileExpression_10= ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9590,7 +9875,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 12 :
-                    // InternalMenuDsl.g:3450:3: this_XThrowExpression_11= ruleXThrowExpression
+                    // InternalMenuDsl.g:3550:3: this_XThrowExpression_11= ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9612,7 +9897,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 13 :
-                    // InternalMenuDsl.g:3459:3: this_XReturnExpression_12= ruleXReturnExpression
+                    // InternalMenuDsl.g:3559:3: this_XReturnExpression_12= ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9634,7 +9919,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 14 :
-                    // InternalMenuDsl.g:3468:3: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
+                    // InternalMenuDsl.g:3568:3: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9656,7 +9941,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 15 :
-                    // InternalMenuDsl.g:3477:3: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
+                    // InternalMenuDsl.g:3577:3: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9702,7 +9987,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // InternalMenuDsl.g:3489:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
+    // InternalMenuDsl.g:3589:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
     public final EObject entryRuleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -9710,8 +9995,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3489:49: (iv_ruleXLiteral= ruleXLiteral EOF )
-            // InternalMenuDsl.g:3490:2: iv_ruleXLiteral= ruleXLiteral EOF
+            // InternalMenuDsl.g:3589:49: (iv_ruleXLiteral= ruleXLiteral EOF )
+            // InternalMenuDsl.g:3590:2: iv_ruleXLiteral= ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXLiteralRule()); 
@@ -9742,7 +10027,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXLiteral"
-    // InternalMenuDsl.g:3496: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 ) ;
+    // InternalMenuDsl.g:3596: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;
 
@@ -9765,44 +10050,44 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3502: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 ) )
-            // InternalMenuDsl.g:3503: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 )
+            // InternalMenuDsl.g:3602: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 ) )
+            // InternalMenuDsl.g:3603: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 )
             {
-            // InternalMenuDsl.g:3503: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 alt64=7;
-            int LA64_0 = input.LA(1);
+            // InternalMenuDsl.g:3603: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 alt62=7;
+            int LA62_0 = input.LA(1);
 
-            if ( (LA64_0==43) ) {
-                alt64=1;
+            if ( (LA62_0==45) ) {
+                alt62=1;
             }
-            else if ( (LA64_0==44) && (synpred27_InternalMenuDsl())) {
-                alt64=2;
+            else if ( (LA62_0==46) && (synpred27_InternalMenuDsl())) {
+                alt62=2;
             }
-            else if ( ((LA64_0>=94 && LA64_0<=95)) ) {
-                alt64=3;
+            else if ( ((LA62_0>=96 && LA62_0<=97)) ) {
+                alt62=3;
             }
-            else if ( ((LA64_0>=RULE_HEX && LA64_0<=RULE_DECIMAL)) ) {
-                alt64=4;
+            else if ( ((LA62_0>=RULE_HEX && LA62_0<=RULE_DECIMAL)) ) {
+                alt62=4;
             }
-            else if ( (LA64_0==96) ) {
-                alt64=5;
+            else if ( (LA62_0==98) ) {
+                alt62=5;
             }
-            else if ( (LA64_0==RULE_STRING) ) {
-                alt64=6;
+            else if ( (LA62_0==RULE_STRING) ) {
+                alt62=6;
             }
-            else if ( (LA64_0==97) ) {
-                alt64=7;
+            else if ( (LA62_0==99) ) {
+                alt62=7;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 64, 0, input);
+                    new NoViableAltException("", 62, 0, input);
 
                 throw nvae;
             }
-            switch (alt64) {
+            switch (alt62) {
                 case 1 :
-                    // InternalMenuDsl.g:3504:3: this_XCollectionLiteral_0= ruleXCollectionLiteral
+                    // InternalMenuDsl.g:3604:3: this_XCollectionLiteral_0= ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9824,10 +10109,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3513:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalMenuDsl.g:3613:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
                     {
-                    // InternalMenuDsl.g:3513:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
-                    // InternalMenuDsl.g:3514:4: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
+                    // InternalMenuDsl.g:3613:3: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalMenuDsl.g:3614:4: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9852,7 +10137,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:3530:3: this_XBooleanLiteral_2= ruleXBooleanLiteral
+                    // InternalMenuDsl.g:3630:3: this_XBooleanLiteral_2= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9874,7 +10159,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:3539:3: this_XNumberLiteral_3= ruleXNumberLiteral
+                    // InternalMenuDsl.g:3639:3: this_XNumberLiteral_3= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9896,7 +10181,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:3548:3: this_XNullLiteral_4= ruleXNullLiteral
+                    // InternalMenuDsl.g:3648:3: this_XNullLiteral_4= ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9918,7 +10203,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 6 :
-                    // InternalMenuDsl.g:3557:3: this_XStringLiteral_5= ruleXStringLiteral
+                    // InternalMenuDsl.g:3657:3: this_XStringLiteral_5= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9940,7 +10225,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 7 :
-                    // InternalMenuDsl.g:3566:3: this_XTypeLiteral_6= ruleXTypeLiteral
+                    // InternalMenuDsl.g:3666:3: this_XTypeLiteral_6= ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -9986,7 +10271,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // InternalMenuDsl.g:3578:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
+    // InternalMenuDsl.g:3678:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
     public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -9994,8 +10279,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3578:59: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
-            // InternalMenuDsl.g:3579:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
+            // InternalMenuDsl.g:3678:59: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
+            // InternalMenuDsl.g:3679:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCollectionLiteralRule()); 
@@ -10026,7 +10311,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // InternalMenuDsl.g:3585:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
+    // InternalMenuDsl.g:3685:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
     public final EObject ruleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10039,26 +10324,26 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3591:2: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
-            // InternalMenuDsl.g:3592:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalMenuDsl.g:3691:2: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
+            // InternalMenuDsl.g:3692:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             {
-            // InternalMenuDsl.g:3592:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
-            int alt65=2;
-            int LA65_0 = input.LA(1);
+            // InternalMenuDsl.g:3692:2: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            int alt63=2;
+            int LA63_0 = input.LA(1);
 
-            if ( (LA65_0==43) ) {
-                int LA65_1 = input.LA(2);
+            if ( (LA63_0==45) ) {
+                int LA63_1 = input.LA(2);
 
-                if ( (LA65_1==44) ) {
-                    alt65=2;
+                if ( (LA63_1==26) ) {
+                    alt63=1;
                 }
-                else if ( (LA65_1==14) ) {
-                    alt65=1;
+                else if ( (LA63_1==46) ) {
+                    alt63=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 65, 1, input);
+                        new NoViableAltException("", 63, 1, input);
 
                     throw nvae;
                 }
@@ -10066,13 +10351,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 65, 0, input);
+                    new NoViableAltException("", 63, 0, input);
 
                 throw nvae;
             }
-            switch (alt65) {
+            switch (alt63) {
                 case 1 :
-                    // InternalMenuDsl.g:3593:3: this_XSetLiteral_0= ruleXSetLiteral
+                    // InternalMenuDsl.g:3693:3: this_XSetLiteral_0= ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -10094,7 +10379,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:3602:3: this_XListLiteral_1= ruleXListLiteral
+                    // InternalMenuDsl.g:3702:3: this_XListLiteral_1= ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
 
@@ -10140,7 +10425,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // InternalMenuDsl.g:3614:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
+    // InternalMenuDsl.g:3714:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
     public final EObject entryRuleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10148,8 +10433,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3614:52: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
-            // InternalMenuDsl.g:3615:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
+            // InternalMenuDsl.g:3714:52: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
+            // InternalMenuDsl.g:3715:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSetLiteralRule()); 
@@ -10180,7 +10465,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // InternalMenuDsl.g:3621:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
+    // InternalMenuDsl.g:3721: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;
 
@@ -10197,14 +10482,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3627:2: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
-            // InternalMenuDsl.g:3628:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalMenuDsl.g:3727:2: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
+            // InternalMenuDsl.g:3728:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
             {
-            // InternalMenuDsl.g:3628:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
-            // InternalMenuDsl.g:3629:3: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
+            // InternalMenuDsl.g:3728:2: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalMenuDsl.g:3729:3: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
             {
-            // InternalMenuDsl.g:3629:3: ()
-            // InternalMenuDsl.g:3630:4: 
+            // InternalMenuDsl.g:3729:3: ()
+            // InternalMenuDsl.g:3730:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -10216,34 +10501,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,43,FOLLOW_57); if (state.failed) return current;
+            otherlv_1=(Token)match(input,45,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,14,FOLLOW_58); if (state.failed) return current;
+            otherlv_2=(Token)match(input,26,FOLLOW_58); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2());
               		
             }
-            // InternalMenuDsl.g:3644:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
-            int alt67=2;
-            int LA67_0 = input.LA(1);
+            // InternalMenuDsl.g:3744:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            int alt65=2;
+            int LA65_0 = input.LA(1);
 
-            if ( ((LA67_0>=RULE_STRING && LA67_0<=RULE_DECIMAL)||LA67_0==14||(LA67_0>=32 && LA67_0<=34)||LA67_0==39||(LA67_0>=43 && LA67_0<=44)||LA67_0==51||(LA67_0>=67 && LA67_0<=68)||LA67_0==72||LA67_0==80||LA67_0==82||(LA67_0>=86 && LA67_0<=88)||(LA67_0>=91 && LA67_0<=100)||LA67_0==102) ) {
-                alt67=1;
+            if ( ((LA65_0>=RULE_STRING && LA65_0<=RULE_DECIMAL)||LA65_0==26||(LA65_0>=34 && LA65_0<=36)||LA65_0==41||(LA65_0>=45 && LA65_0<=46)||LA65_0==53||(LA65_0>=69 && LA65_0<=70)||LA65_0==74||LA65_0==82||LA65_0==84||(LA65_0>=88 && LA65_0<=90)||(LA65_0>=93 && LA65_0<=102)||LA65_0==104) ) {
+                alt65=1;
             }
-            switch (alt67) {
+            switch (alt65) {
                 case 1 :
-                    // InternalMenuDsl.g:3645:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalMenuDsl.g:3745:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // InternalMenuDsl.g:3645:4: ( (lv_elements_3_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:3646:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalMenuDsl.g:3745:4: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:3746:5: (lv_elements_3_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:3646:5: (lv_elements_3_0= ruleXExpression )
-                    // InternalMenuDsl.g:3647:6: lv_elements_3_0= ruleXExpression
+                    // InternalMenuDsl.g:3746:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalMenuDsl.g:3747:6: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -10274,32 +10559,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:3664:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
-                    loop66:
+                    // InternalMenuDsl.g:3764:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    loop64:
                     do {
-                        int alt66=2;
-                        int LA66_0 = input.LA(1);
+                        int alt64=2;
+                        int LA64_0 = input.LA(1);
 
-                        if ( (LA66_0==40) ) {
-                            alt66=1;
+                        if ( (LA64_0==42) ) {
+                            alt64=1;
                         }
 
 
-                        switch (alt66) {
+                        switch (alt64) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:3665:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalMenuDsl.g:3765:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_4, grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0());
                     	      				
                     	    }
-                    	    // InternalMenuDsl.g:3669:5: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // InternalMenuDsl.g:3670:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalMenuDsl.g:3769:5: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalMenuDsl.g:3770:6: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // InternalMenuDsl.g:3670:6: (lv_elements_5_0= ruleXExpression )
-                    	    // InternalMenuDsl.g:3671:7: lv_elements_5_0= ruleXExpression
+                    	    // InternalMenuDsl.g:3770:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalMenuDsl.g:3771:7: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -10335,7 +10620,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop66;
+                    	    break loop64;
                         }
                     } while (true);
 
@@ -10345,7 +10630,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
+            otherlv_6=(Token)match(input,27,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4());
@@ -10376,7 +10661,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // InternalMenuDsl.g:3698:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
+    // InternalMenuDsl.g:3798:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
     public final EObject entryRuleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10384,8 +10669,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3698:53: (iv_ruleXListLiteral= ruleXListLiteral EOF )
-            // InternalMenuDsl.g:3699:2: iv_ruleXListLiteral= ruleXListLiteral EOF
+            // InternalMenuDsl.g:3798:53: (iv_ruleXListLiteral= ruleXListLiteral EOF )
+            // InternalMenuDsl.g:3799:2: iv_ruleXListLiteral= ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXListLiteralRule()); 
@@ -10416,7 +10701,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // InternalMenuDsl.g:3705:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
+    // InternalMenuDsl.g:3805: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;
 
@@ -10433,14 +10718,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3711:2: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
-            // InternalMenuDsl.g:3712:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalMenuDsl.g:3811:2: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
+            // InternalMenuDsl.g:3812:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
             {
-            // InternalMenuDsl.g:3712:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
-            // InternalMenuDsl.g:3713:3: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
+            // InternalMenuDsl.g:3812:2: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalMenuDsl.g:3813:3: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
             {
-            // InternalMenuDsl.g:3713:3: ()
-            // InternalMenuDsl.g:3714:4: 
+            // InternalMenuDsl.g:3813:3: ()
+            // InternalMenuDsl.g:3814:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -10452,41 +10737,41 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
+            otherlv_1=(Token)match(input,45,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,44,FOLLOW_29); if (state.failed) return current;
+            otherlv_2=(Token)match(input,46,FOLLOW_30); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2());
               		
             }
-            // InternalMenuDsl.g:3728:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
-            int alt69=2;
-            int LA69_0 = input.LA(1);
+            // InternalMenuDsl.g:3828:3: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            int alt67=2;
+            int LA67_0 = input.LA(1);
 
-            if ( ((LA69_0>=RULE_STRING && LA69_0<=RULE_DECIMAL)||LA69_0==14||(LA69_0>=32 && LA69_0<=34)||LA69_0==39||(LA69_0>=43 && LA69_0<=44)||LA69_0==51||(LA69_0>=67 && LA69_0<=68)||LA69_0==72||LA69_0==80||LA69_0==82||(LA69_0>=86 && LA69_0<=88)||(LA69_0>=91 && LA69_0<=100)||LA69_0==102) ) {
-                alt69=1;
+            if ( ((LA67_0>=RULE_STRING && LA67_0<=RULE_DECIMAL)||LA67_0==26||(LA67_0>=34 && LA67_0<=36)||LA67_0==41||(LA67_0>=45 && LA67_0<=46)||LA67_0==53||(LA67_0>=69 && LA67_0<=70)||LA67_0==74||LA67_0==82||LA67_0==84||(LA67_0>=88 && LA67_0<=90)||(LA67_0>=93 && LA67_0<=102)||LA67_0==104) ) {
+                alt67=1;
             }
-            switch (alt69) {
+            switch (alt67) {
                 case 1 :
-                    // InternalMenuDsl.g:3729:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalMenuDsl.g:3829:4: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // InternalMenuDsl.g:3729:4: ( (lv_elements_3_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:3730:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalMenuDsl.g:3829:4: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:3830:5: (lv_elements_3_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:3730:5: (lv_elements_3_0= ruleXExpression )
-                    // InternalMenuDsl.g:3731:6: lv_elements_3_0= ruleXExpression
+                    // InternalMenuDsl.g:3830:5: (lv_elements_3_0= ruleXExpression )
+                    // InternalMenuDsl.g:3831:6: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0());
                       					
                     }
-                    pushFollow(FOLLOW_30);
+                    pushFollow(FOLLOW_31);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -10510,39 +10795,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:3748:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
-                    loop68:
+                    // InternalMenuDsl.g:3848:4: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    loop66:
                     do {
-                        int alt68=2;
-                        int LA68_0 = input.LA(1);
+                        int alt66=2;
+                        int LA66_0 = input.LA(1);
 
-                        if ( (LA68_0==40) ) {
-                            alt68=1;
+                        if ( (LA66_0==42) ) {
+                            alt66=1;
                         }
 
 
-                        switch (alt68) {
+                        switch (alt66) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:3749:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalMenuDsl.g:3849:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_4, grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0());
                     	      				
                     	    }
-                    	    // InternalMenuDsl.g:3753:5: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // InternalMenuDsl.g:3754:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalMenuDsl.g:3853:5: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalMenuDsl.g:3854:6: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // InternalMenuDsl.g:3754:6: (lv_elements_5_0= ruleXExpression )
-                    	    // InternalMenuDsl.g:3755:7: lv_elements_5_0= ruleXExpression
+                    	    // InternalMenuDsl.g:3854:6: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalMenuDsl.g:3855:7: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_30);
+                    	    pushFollow(FOLLOW_31);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -10571,7 +10856,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop68;
+                    	    break loop66;
                         }
                     } while (true);
 
@@ -10581,7 +10866,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
+            otherlv_6=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -10612,7 +10897,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // InternalMenuDsl.g:3782:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
+    // InternalMenuDsl.g:3882:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
     public final EObject entryRuleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -10620,8 +10905,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3782:49: (iv_ruleXClosure= ruleXClosure EOF )
-            // InternalMenuDsl.g:3783:2: iv_ruleXClosure= ruleXClosure EOF
+            // InternalMenuDsl.g:3882:49: (iv_ruleXClosure= ruleXClosure EOF )
+            // InternalMenuDsl.g:3883:2: iv_ruleXClosure= ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXClosureRule()); 
@@ -10652,7 +10937,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXClosure"
-    // InternalMenuDsl.g:3789: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= ']' ) ;
+    // InternalMenuDsl.g:3889: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;
 
@@ -10671,20 +10956,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3795: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= ']' ) )
-            // InternalMenuDsl.g:3796: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= ']' )
+            // InternalMenuDsl.g:3895: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= ']' ) )
+            // InternalMenuDsl.g:3896: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= ']' )
             {
-            // InternalMenuDsl.g:3796: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= ']' )
-            // InternalMenuDsl.g:3797: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= ']'
+            // InternalMenuDsl.g:3896: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= ']' )
+            // InternalMenuDsl.g:3897: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= ']'
             {
-            // InternalMenuDsl.g:3797:3: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
-            // InternalMenuDsl.g:3798:4: ( ( () '[' ) )=> ( () otherlv_1= '[' )
+            // InternalMenuDsl.g:3897:3: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
+            // InternalMenuDsl.g:3898:4: ( ( () '[' ) )=> ( () otherlv_1= '[' )
             {
-            // InternalMenuDsl.g:3804:4: ( () otherlv_1= '[' )
-            // InternalMenuDsl.g:3805:5: () otherlv_1= '['
+            // InternalMenuDsl.g:3904:4: ( () otherlv_1= '[' )
+            // InternalMenuDsl.g:3905:5: () otherlv_1= '['
             {
-            // InternalMenuDsl.g:3805:5: ()
-            // InternalMenuDsl.g:3806:6: 
+            // InternalMenuDsl.g:3905:5: ()
+            // InternalMenuDsl.g:3906:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -10696,7 +10981,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,44,FOLLOW_60); if (state.failed) return current;
+            otherlv_1=(Token)match(input,46,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1());
@@ -10708,32 +10993,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:3818:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
-            int alt72=2;
-            alt72 = dfa72.predict(input);
-            switch (alt72) {
+            // InternalMenuDsl.g:3918:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
+            int alt70=2;
+            alt70 = dfa70.predict(input);
+            switch (alt70) {
                 case 1 :
-                    // InternalMenuDsl.g:3819:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalMenuDsl.g:3919:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
                     {
-                    // InternalMenuDsl.g:3842:4: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
-                    // InternalMenuDsl.g:3843:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalMenuDsl.g:3942:4: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalMenuDsl.g:3943:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
                     {
-                    // InternalMenuDsl.g:3843:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
-                    int alt71=2;
-                    int LA71_0 = input.LA(1);
+                    // InternalMenuDsl.g:3943:5: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
+                    int alt69=2;
+                    int LA69_0 = input.LA(1);
 
-                    if ( (LA71_0==RULE_ID||LA71_0==39||LA71_0==64) ) {
-                        alt71=1;
+                    if ( (LA69_0==RULE_ID||LA69_0==41||LA69_0==66) ) {
+                        alt69=1;
                     }
-                    switch (alt71) {
+                    switch (alt69) {
                         case 1 :
-                            // InternalMenuDsl.g:3844:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalMenuDsl.g:3944:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             {
-                            // InternalMenuDsl.g:3844:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
-                            // InternalMenuDsl.g:3845:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalMenuDsl.g:3944:6: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
+                            // InternalMenuDsl.g:3945:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
                             {
-                            // InternalMenuDsl.g:3845:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
-                            // InternalMenuDsl.g:3846:8: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
+                            // InternalMenuDsl.g:3945:7: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalMenuDsl.g:3946:8: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
 
@@ -10764,32 +11049,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:3863:6: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
-                            loop70:
+                            // InternalMenuDsl.g:3963:6: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            loop68:
                             do {
-                                int alt70=2;
-                                int LA70_0 = input.LA(1);
+                                int alt68=2;
+                                int LA68_0 = input.LA(1);
 
-                                if ( (LA70_0==40) ) {
-                                    alt70=1;
+                                if ( (LA68_0==42) ) {
+                                    alt68=1;
                                 }
 
 
-                                switch (alt70) {
+                                switch (alt68) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:3864:7: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalMenuDsl.g:3964:7: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
                             	    {
-                            	    otherlv_3=(Token)match(input,40,FOLLOW_40); if (state.failed) return current;
+                            	    otherlv_3=(Token)match(input,42,FOLLOW_41); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_3, grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0());
                             	      						
                             	    }
-                            	    // InternalMenuDsl.g:3868:7: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
-                            	    // InternalMenuDsl.g:3869:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalMenuDsl.g:3968:7: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalMenuDsl.g:3969:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
                             	    {
-                            	    // InternalMenuDsl.g:3869:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
-                            	    // InternalMenuDsl.g:3870:9: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
+                            	    // InternalMenuDsl.g:3969:8: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalMenuDsl.g:3970:9: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
 
@@ -10825,7 +11110,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop70;
+                            	    break loop68;
                                 }
                             } while (true);
 
@@ -10835,13 +11120,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:3889:5: ( (lv_explicitSyntax_5_0= '|' ) )
-                    // InternalMenuDsl.g:3890:6: (lv_explicitSyntax_5_0= '|' )
+                    // InternalMenuDsl.g:3989:5: ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalMenuDsl.g:3990:6: (lv_explicitSyntax_5_0= '|' )
                     {
-                    // InternalMenuDsl.g:3890:6: (lv_explicitSyntax_5_0= '|' )
-                    // InternalMenuDsl.g:3891:7: lv_explicitSyntax_5_0= '|'
+                    // InternalMenuDsl.g:3990:6: (lv_explicitSyntax_5_0= '|' )
+                    // InternalMenuDsl.g:3991:7: lv_explicitSyntax_5_0= '|'
                     {
-                    lv_explicitSyntax_5_0=(Token)match(input,79,FOLLOW_62); if (state.failed) return current;
+                    lv_explicitSyntax_5_0=(Token)match(input,81,FOLLOW_62); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(lv_explicitSyntax_5_0, grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0());
@@ -10870,11 +11155,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:3905:3: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
-            // InternalMenuDsl.g:3906:4: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalMenuDsl.g:4005:3: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
+            // InternalMenuDsl.g:4006:4: (lv_expression_6_0= ruleXExpressionInClosure )
             {
-            // InternalMenuDsl.g:3906:4: (lv_expression_6_0= ruleXExpressionInClosure )
-            // InternalMenuDsl.g:3907:5: lv_expression_6_0= ruleXExpressionInClosure
+            // InternalMenuDsl.g:4006:4: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalMenuDsl.g:4007:5: lv_expression_6_0= ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
 
@@ -10905,7 +11190,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_7=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
+            otherlv_7=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_7, grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3());
@@ -10936,7 +11221,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // InternalMenuDsl.g:3932:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
+    // InternalMenuDsl.g:4032:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
     public final EObject entryRuleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -10944,8 +11229,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3932:61: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
-            // InternalMenuDsl.g:3933:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
+            // InternalMenuDsl.g:4032:61: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
+            // InternalMenuDsl.g:4033:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionInClosureRule()); 
@@ -10976,7 +11261,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // InternalMenuDsl.g:3939:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
+    // InternalMenuDsl.g:4039:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
     public final EObject ruleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -10988,14 +11273,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3945:2: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
-            // InternalMenuDsl.g:3946:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalMenuDsl.g:4045:2: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
+            // InternalMenuDsl.g:4046:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
             {
-            // InternalMenuDsl.g:3946:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
-            // InternalMenuDsl.g:3947:3: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalMenuDsl.g:4046:2: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalMenuDsl.g:4047:3: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             {
-            // InternalMenuDsl.g:3947:3: ()
-            // InternalMenuDsl.g:3948:4: 
+            // InternalMenuDsl.g:4047:3: ()
+            // InternalMenuDsl.g:4048:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11007,26 +11292,26 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:3954:3: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
-            loop74:
+            // InternalMenuDsl.g:4054:3: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            loop72:
             do {
-                int alt74=2;
-                int LA74_0 = input.LA(1);
+                int alt72=2;
+                int LA72_0 = input.LA(1);
 
-                if ( ((LA74_0>=RULE_STRING && LA74_0<=RULE_DECIMAL)||LA74_0==14||(LA74_0>=32 && LA74_0<=34)||LA74_0==39||(LA74_0>=43 && LA74_0<=44)||LA74_0==51||(LA74_0>=67 && LA74_0<=68)||LA74_0==72||LA74_0==80||LA74_0==82||(LA74_0>=86 && LA74_0<=100)||LA74_0==102) ) {
-                    alt74=1;
+                if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_DECIMAL)||LA72_0==26||(LA72_0>=34 && LA72_0<=36)||LA72_0==41||(LA72_0>=45 && LA72_0<=46)||LA72_0==53||(LA72_0>=69 && LA72_0<=70)||LA72_0==74||LA72_0==82||LA72_0==84||(LA72_0>=88 && LA72_0<=102)||LA72_0==104) ) {
+                    alt72=1;
                 }
 
 
-                switch (alt74) {
+                switch (alt72) {
             	case 1 :
-            	    // InternalMenuDsl.g:3955:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
+            	    // InternalMenuDsl.g:4055:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
             	    {
-            	    // InternalMenuDsl.g:3955:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
-            	    // InternalMenuDsl.g:3956:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalMenuDsl.g:4055:4: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalMenuDsl.g:4056:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // InternalMenuDsl.g:3956:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
-            	    // InternalMenuDsl.g:3957:6: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
+            	    // InternalMenuDsl.g:4056:5: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalMenuDsl.g:4057:6: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11057,18 +11342,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:3974:4: (otherlv_2= ';' )?
-            	    int alt73=2;
-            	    int LA73_0 = input.LA(1);
+            	    // InternalMenuDsl.g:4074:4: (otherlv_2= ';' )?
+            	    int alt71=2;
+            	    int LA71_0 = input.LA(1);
 
-            	    if ( (LA73_0==37) ) {
-            	        alt73=1;
+            	    if ( (LA71_0==39) ) {
+            	        alt71=1;
             	    }
-            	    switch (alt73) {
+            	    switch (alt71) {
             	        case 1 :
-            	            // InternalMenuDsl.g:3975:5: otherlv_2= ';'
+            	            // InternalMenuDsl.g:4075:5: otherlv_2= ';'
             	            {
-            	            otherlv_2=(Token)match(input,37,FOLLOW_65); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,39,FOLLOW_65); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              					newLeafNode(otherlv_2, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1());
@@ -11085,7 +11370,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop74;
+            	    break loop72;
                 }
             } while (true);
 
@@ -11114,7 +11399,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // InternalMenuDsl.g:3985:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
+    // InternalMenuDsl.g:4085:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
     public final EObject entryRuleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -11122,8 +11407,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:3985:54: (iv_ruleXShortClosure= ruleXShortClosure EOF )
-            // InternalMenuDsl.g:3986:2: iv_ruleXShortClosure= ruleXShortClosure EOF
+            // InternalMenuDsl.g:4085:54: (iv_ruleXShortClosure= ruleXShortClosure EOF )
+            // InternalMenuDsl.g:4086:2: iv_ruleXShortClosure= ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXShortClosureRule()); 
@@ -11154,7 +11439,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // InternalMenuDsl.g:3992: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 ) ) ) ;
+    // InternalMenuDsl.g:4092: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;
 
@@ -11171,20 +11456,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:3998:2: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // InternalMenuDsl.g:3999:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:4098:2: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalMenuDsl.g:4099:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // InternalMenuDsl.g:3999:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
-            // InternalMenuDsl.g:4000:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4099:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:4100:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // InternalMenuDsl.g:4000:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
-            // InternalMenuDsl.g:4001:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalMenuDsl.g:4100:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
+            // InternalMenuDsl.g:4101:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
             {
-            // InternalMenuDsl.g:4026:4: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
-            // InternalMenuDsl.g:4027:5: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalMenuDsl.g:4126:4: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalMenuDsl.g:4127:5: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
             {
-            // InternalMenuDsl.g:4027:5: ()
-            // InternalMenuDsl.g:4028:6: 
+            // InternalMenuDsl.g:4127:5: ()
+            // InternalMenuDsl.g:4128:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11196,22 +11481,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4034:5: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
-            int alt76=2;
-            int LA76_0 = input.LA(1);
+            // InternalMenuDsl.g:4134:5: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
+            int alt74=2;
+            int LA74_0 = input.LA(1);
 
-            if ( (LA76_0==RULE_ID||LA76_0==39||LA76_0==64) ) {
-                alt76=1;
+            if ( (LA74_0==RULE_ID||LA74_0==41||LA74_0==66) ) {
+                alt74=1;
             }
-            switch (alt76) {
+            switch (alt74) {
                 case 1 :
-                    // InternalMenuDsl.g:4035:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalMenuDsl.g:4135:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     {
-                    // InternalMenuDsl.g:4035:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
-                    // InternalMenuDsl.g:4036:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalMenuDsl.g:4135:6: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
+                    // InternalMenuDsl.g:4136:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
                     {
-                    // InternalMenuDsl.g:4036:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
-                    // InternalMenuDsl.g:4037:8: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
+                    // InternalMenuDsl.g:4136:7: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalMenuDsl.g:4137:8: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11242,32 +11527,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:4054:6: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
-                    loop75:
+                    // InternalMenuDsl.g:4154:6: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    loop73:
                     do {
-                        int alt75=2;
-                        int LA75_0 = input.LA(1);
+                        int alt73=2;
+                        int LA73_0 = input.LA(1);
 
-                        if ( (LA75_0==40) ) {
-                            alt75=1;
+                        if ( (LA73_0==42) ) {
+                            alt73=1;
                         }
 
 
-                        switch (alt75) {
+                        switch (alt73) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:4055:7: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalMenuDsl.g:4155:7: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
                     	    {
-                    	    otherlv_2=(Token)match(input,40,FOLLOW_40); if (state.failed) return current;
+                    	    otherlv_2=(Token)match(input,42,FOLLOW_41); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      							newLeafNode(otherlv_2, grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0());
                     	      						
                     	    }
-                    	    // InternalMenuDsl.g:4059:7: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
-                    	    // InternalMenuDsl.g:4060:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalMenuDsl.g:4159:7: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalMenuDsl.g:4160:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
                     	    {
-                    	    // InternalMenuDsl.g:4060:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
-                    	    // InternalMenuDsl.g:4061:9: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
+                    	    // InternalMenuDsl.g:4160:8: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalMenuDsl.g:4161:9: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -11303,7 +11588,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop75;
+                    	    break loop73;
                         }
                     } while (true);
 
@@ -11313,13 +11598,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4080:5: ( (lv_explicitSyntax_4_0= '|' ) )
-            // InternalMenuDsl.g:4081:6: (lv_explicitSyntax_4_0= '|' )
+            // InternalMenuDsl.g:4180:5: ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalMenuDsl.g:4181:6: (lv_explicitSyntax_4_0= '|' )
             {
-            // InternalMenuDsl.g:4081:6: (lv_explicitSyntax_4_0= '|' )
-            // InternalMenuDsl.g:4082:7: lv_explicitSyntax_4_0= '|'
+            // InternalMenuDsl.g:4181:6: (lv_explicitSyntax_4_0= '|' )
+            // InternalMenuDsl.g:4182:7: lv_explicitSyntax_4_0= '|'
             {
-            lv_explicitSyntax_4_0=(Token)match(input,79,FOLLOW_27); if (state.failed) return current;
+            lv_explicitSyntax_4_0=(Token)match(input,81,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               							newLeafNode(lv_explicitSyntax_4_0, grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0());
@@ -11345,11 +11630,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4096:3: ( (lv_expression_5_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4097:4: (lv_expression_5_0= ruleXExpression )
+            // InternalMenuDsl.g:4196:3: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4197:4: (lv_expression_5_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4097:4: (lv_expression_5_0= ruleXExpression )
-            // InternalMenuDsl.g:4098:5: lv_expression_5_0= ruleXExpression
+            // InternalMenuDsl.g:4197:4: (lv_expression_5_0= ruleXExpression )
+            // InternalMenuDsl.g:4198:5: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -11405,7 +11690,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // InternalMenuDsl.g:4119:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
+    // InternalMenuDsl.g:4219:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
     public final EObject entryRuleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11413,8 +11698,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4119:65: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
-            // InternalMenuDsl.g:4120:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
+            // InternalMenuDsl.g:4219:65: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
+            // InternalMenuDsl.g:4220:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXParenthesizedExpressionRule()); 
@@ -11445,7 +11730,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // InternalMenuDsl.g:4126:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
+    // InternalMenuDsl.g:4226:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
     public final EObject ruleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11458,13 +11743,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4132:2: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
-            // InternalMenuDsl.g:4133:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalMenuDsl.g:4232:2: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
+            // InternalMenuDsl.g:4233:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
             {
-            // InternalMenuDsl.g:4133:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
-            // InternalMenuDsl.g:4134:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
+            // InternalMenuDsl.g:4233:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalMenuDsl.g:4234:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,39,FOLLOW_27); if (state.failed) return current;
+            otherlv_0=(Token)match(input,41,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -11475,7 +11760,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			newCompositeNode(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1());
               		
             }
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_26);
             this_XExpression_1=ruleXExpression();
 
             state._fsp--;
@@ -11486,7 +11771,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            otherlv_2=(Token)match(input,41,FOLLOW_2); if (state.failed) return current;
+            otherlv_2=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -11517,7 +11802,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // InternalMenuDsl.g:4154:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
+    // InternalMenuDsl.g:4254:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
     public final EObject entryRuleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11525,8 +11810,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4154:54: (iv_ruleXIfExpression= ruleXIfExpression EOF )
-            // InternalMenuDsl.g:4155:2: iv_ruleXIfExpression= ruleXIfExpression EOF
+            // InternalMenuDsl.g:4254:54: (iv_ruleXIfExpression= ruleXIfExpression EOF )
+            // InternalMenuDsl.g:4255:2: iv_ruleXIfExpression= ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIfExpressionRule()); 
@@ -11557,7 +11842,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // InternalMenuDsl.g:4161: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 ) ) )? ) ;
+    // InternalMenuDsl.g:4261: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;
 
@@ -11576,14 +11861,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4167: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 ) ) )? ) )
-            // InternalMenuDsl.g:4168: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 ) ) )? )
+            // InternalMenuDsl.g:4267: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 ) ) )? ) )
+            // InternalMenuDsl.g:4268: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 ) ) )? )
             {
-            // InternalMenuDsl.g:4168: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 ) ) )? )
-            // InternalMenuDsl.g:4169: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 ) ) )?
+            // InternalMenuDsl.g:4268: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 ) ) )? )
+            // InternalMenuDsl.g:4269: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 ) ) )?
             {
-            // InternalMenuDsl.g:4169:3: ()
-            // InternalMenuDsl.g:4170:4: 
+            // InternalMenuDsl.g:4269:3: ()
+            // InternalMenuDsl.g:4270:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11595,30 +11880,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,80,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,82,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXIfExpressionAccess().getIfKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,39,FOLLOW_27); if (state.failed) return current;
+            otherlv_2=(Token)match(input,41,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalMenuDsl.g:4184:3: ( (lv_if_3_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4185:4: (lv_if_3_0= ruleXExpression )
+            // InternalMenuDsl.g:4284:3: ( (lv_if_3_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4285:4: (lv_if_3_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4185:4: (lv_if_3_0= ruleXExpression )
-            // InternalMenuDsl.g:4186:5: lv_if_3_0= ruleXExpression
+            // InternalMenuDsl.g:4285:4: (lv_if_3_0= ruleXExpression )
+            // InternalMenuDsl.g:4286:5: lv_if_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0());
               				
             }
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_26);
             lv_if_3_0=ruleXExpression();
 
             state._fsp--;
@@ -11642,17 +11927,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,41,FOLLOW_27); if (state.failed) return current;
+            otherlv_4=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4());
               		
             }
-            // InternalMenuDsl.g:4207:3: ( (lv_then_5_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4208:4: (lv_then_5_0= ruleXExpression )
+            // InternalMenuDsl.g:4307:3: ( (lv_then_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4308:4: (lv_then_5_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4208:4: (lv_then_5_0= ruleXExpression )
-            // InternalMenuDsl.g:4209:5: lv_then_5_0= ruleXExpression
+            // InternalMenuDsl.g:4308:4: (lv_then_5_0= ruleXExpression )
+            // InternalMenuDsl.g:4309:5: lv_then_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -11683,25 +11968,25 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4226:3: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
-            int alt77=2;
-            int LA77_0 = input.LA(1);
+            // InternalMenuDsl.g:4326:3: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            int alt75=2;
+            int LA75_0 = input.LA(1);
 
-            if ( (LA77_0==81) ) {
-                int LA77_1 = input.LA(2);
+            if ( (LA75_0==83) ) {
+                int LA75_1 = input.LA(2);
 
                 if ( (synpred31_InternalMenuDsl()) ) {
-                    alt77=1;
+                    alt75=1;
                 }
             }
-            switch (alt77) {
+            switch (alt75) {
                 case 1 :
-                    // InternalMenuDsl.g:4227:4: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4327:4: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
                     {
-                    // InternalMenuDsl.g:4227:4: ( ( 'else' )=>otherlv_6= 'else' )
-                    // InternalMenuDsl.g:4228:5: ( 'else' )=>otherlv_6= 'else'
+                    // InternalMenuDsl.g:4327:4: ( ( 'else' )=>otherlv_6= 'else' )
+                    // InternalMenuDsl.g:4328:5: ( 'else' )=>otherlv_6= 'else'
                     {
-                    otherlv_6=(Token)match(input,81,FOLLOW_27); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,83,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_6, grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0());
@@ -11710,11 +11995,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:4234:4: ( (lv_else_7_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:4235:5: (lv_else_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:4334:4: ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4335:5: (lv_else_7_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4235:5: (lv_else_7_0= ruleXExpression )
-                    // InternalMenuDsl.g:4236:6: lv_else_7_0= ruleXExpression
+                    // InternalMenuDsl.g:4335:5: (lv_else_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:4336:6: lv_else_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11776,7 +12061,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // InternalMenuDsl.g:4258:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
+    // InternalMenuDsl.g:4358:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
     public final EObject entryRuleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11784,8 +12069,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4258:58: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
-            // InternalMenuDsl.g:4259:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
+            // InternalMenuDsl.g:4358:58: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
+            // InternalMenuDsl.g:4359:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSwitchExpressionRule()); 
@@ -11816,7 +12101,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // InternalMenuDsl.g:4265: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= '}' ) ;
+    // InternalMenuDsl.g:4365: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;
 
@@ -11846,14 +12131,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4271: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= '}' ) )
-            // InternalMenuDsl.g:4272: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= '}' )
+            // InternalMenuDsl.g:4371: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= '}' ) )
+            // InternalMenuDsl.g:4372: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= '}' )
             {
-            // InternalMenuDsl.g:4272: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= '}' )
-            // InternalMenuDsl.g:4273: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= '}'
+            // InternalMenuDsl.g:4372: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= '}' )
+            // InternalMenuDsl.g:4373: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= '}'
             {
-            // InternalMenuDsl.g:4273:3: ()
-            // InternalMenuDsl.g:4274:4: 
+            // InternalMenuDsl.g:4373:3: ()
+            // InternalMenuDsl.g:4374:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11865,39 +12150,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,82,FOLLOW_68); if (state.failed) return current;
+            otherlv_1=(Token)match(input,84,FOLLOW_68); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1());
               		
             }
-            // InternalMenuDsl.g:4284: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 alt79=2;
-            alt79 = dfa79.predict(input);
-            switch (alt79) {
+            // InternalMenuDsl.g:4384: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 alt77=2;
+            alt77 = dfa77.predict(input);
+            switch (alt77) {
                 case 1 :
-                    // InternalMenuDsl.g:4285:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalMenuDsl.g:4385:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
                     {
-                    // InternalMenuDsl.g:4285:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
-                    // InternalMenuDsl.g:4286:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
+                    // InternalMenuDsl.g:4385:4: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalMenuDsl.g:4386:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
                     {
-                    // InternalMenuDsl.g:4286:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-                    // InternalMenuDsl.g:4287:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalMenuDsl.g:4386:5: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+                    // InternalMenuDsl.g:4387:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
                     {
-                    // InternalMenuDsl.g:4297:6: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-                    // InternalMenuDsl.g:4298:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+                    // InternalMenuDsl.g:4397:6: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalMenuDsl.g:4398:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
                     {
-                    otherlv_2=(Token)match(input,39,FOLLOW_40); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,41,FOLLOW_41); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(otherlv_2, grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0());
                       						
                     }
-                    // InternalMenuDsl.g:4302:7: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-                    // InternalMenuDsl.g:4303:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalMenuDsl.g:4402:7: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+                    // InternalMenuDsl.g:4403:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
                     {
-                    // InternalMenuDsl.g:4303:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-                    // InternalMenuDsl.g:4304:9: lv_declaredParam_3_0= ruleJvmFormalParameter
+                    // InternalMenuDsl.g:4403:8: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalMenuDsl.g:4404:9: lv_declaredParam_3_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11928,7 +12213,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_4=(Token)match(input,83,FOLLOW_27); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,85,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       							newLeafNode(otherlv_4, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2());
@@ -11940,18 +12225,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:4327:5: ( (lv_switch_5_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:4328:6: (lv_switch_5_0= ruleXExpression )
+                    // InternalMenuDsl.g:4427:5: ( (lv_switch_5_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4428:6: (lv_switch_5_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4328:6: (lv_switch_5_0= ruleXExpression )
-                    // InternalMenuDsl.g:4329:7: lv_switch_5_0= ruleXExpression
+                    // InternalMenuDsl.g:4428:6: (lv_switch_5_0= ruleXExpression )
+                    // InternalMenuDsl.g:4429:7: lv_switch_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0());
                       						
                     }
-                    pushFollow(FOLLOW_25);
+                    pushFollow(FOLLOW_26);
                     lv_switch_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -11975,7 +12260,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_6=(Token)match(input,41,FOLLOW_57); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,43,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_6, grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2());
@@ -11988,26 +12273,26 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:4352:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalMenuDsl.g:4452:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
                     {
-                    // InternalMenuDsl.g:4352:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
-                    // InternalMenuDsl.g:4353:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4452:4: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalMenuDsl.g:4453:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
                     {
-                    // InternalMenuDsl.g:4353:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
-                    int alt78=2;
-                    alt78 = dfa78.predict(input);
-                    switch (alt78) {
+                    // InternalMenuDsl.g:4453:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
+                    int alt76=2;
+                    alt76 = dfa76.predict(input);
+                    switch (alt76) {
                         case 1 :
-                            // InternalMenuDsl.g:4354:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalMenuDsl.g:4454:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
                             {
-                            // InternalMenuDsl.g:4363:6: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
-                            // InternalMenuDsl.g:4364:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
+                            // InternalMenuDsl.g:4463:6: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalMenuDsl.g:4464:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
                             {
-                            // InternalMenuDsl.g:4364:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
-                            // InternalMenuDsl.g:4365:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalMenuDsl.g:4464:7: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
+                            // InternalMenuDsl.g:4465:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
                             {
-                            // InternalMenuDsl.g:4365:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
-                            // InternalMenuDsl.g:4366:9: lv_declaredParam_7_0= ruleJvmFormalParameter
+                            // InternalMenuDsl.g:4465:8: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalMenuDsl.g:4466:9: lv_declaredParam_7_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
 
@@ -12038,7 +12323,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            otherlv_8=(Token)match(input,83,FOLLOW_27); if (state.failed) return current;
+                            otherlv_8=(Token)match(input,85,FOLLOW_28); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							newLeafNode(otherlv_8, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1());
@@ -12053,18 +12338,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:4389:5: ( (lv_switch_9_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:4390:6: (lv_switch_9_0= ruleXExpression )
+                    // InternalMenuDsl.g:4489:5: ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4490:6: (lv_switch_9_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4390:6: (lv_switch_9_0= ruleXExpression )
-                    // InternalMenuDsl.g:4391:7: lv_switch_9_0= ruleXExpression
+                    // InternalMenuDsl.g:4490:6: (lv_switch_9_0= ruleXExpression )
+                    // InternalMenuDsl.g:4491:7: lv_switch_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       							newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0());
                       						
                     }
-                    pushFollow(FOLLOW_57);
+                    pushFollow(FOLLOW_15);
                     lv_switch_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -12097,29 +12382,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_10=(Token)match(input,14,FOLLOW_70); if (state.failed) return current;
+            otherlv_10=(Token)match(input,26,FOLLOW_70); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_10, grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3());
               		
             }
-            // InternalMenuDsl.g:4414:3: ( (lv_cases_11_0= ruleXCasePart ) )*
-            loop80:
+            // InternalMenuDsl.g:4514:3: ( (lv_cases_11_0= ruleXCasePart ) )*
+            loop78:
             do {
-                int alt80=2;
-                int LA80_0 = input.LA(1);
+                int alt78=2;
+                int LA78_0 = input.LA(1);
 
-                if ( (LA80_0==RULE_ID||(LA80_0>=39 && LA80_0<=40)||LA80_0==64||LA80_0==83||LA80_0==85) ) {
-                    alt80=1;
+                if ( (LA78_0==RULE_ID||(LA78_0>=41 && LA78_0<=42)||LA78_0==66||LA78_0==85||LA78_0==87) ) {
+                    alt78=1;
                 }
 
 
-                switch (alt80) {
+                switch (alt78) {
             	case 1 :
-            	    // InternalMenuDsl.g:4415:4: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalMenuDsl.g:4515:4: (lv_cases_11_0= ruleXCasePart )
             	    {
-            	    // InternalMenuDsl.g:4415:4: (lv_cases_11_0= ruleXCasePart )
-            	    // InternalMenuDsl.g:4416:5: lv_cases_11_0= ruleXCasePart
+            	    // InternalMenuDsl.g:4515:4: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalMenuDsl.g:4516:5: lv_cases_11_0= ruleXCasePart
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12152,38 +12437,38 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop80;
+            	    break loop78;
                 }
             } while (true);
 
-            // InternalMenuDsl.g:4433:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
-            int alt81=2;
-            int LA81_0 = input.LA(1);
+            // InternalMenuDsl.g:4533:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
+            int alt79=2;
+            int LA79_0 = input.LA(1);
 
-            if ( (LA81_0==84) ) {
-                alt81=1;
+            if ( (LA79_0==86) ) {
+                alt79=1;
             }
-            switch (alt81) {
+            switch (alt79) {
                 case 1 :
-                    // InternalMenuDsl.g:4434:4: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4534:4: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
                     {
-                    otherlv_12=(Token)match(input,84,FOLLOW_69); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,86,FOLLOW_69); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_12, grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0());
                       			
                     }
-                    otherlv_13=(Token)match(input,83,FOLLOW_27); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,85,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_13, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1());
                       			
                     }
-                    // InternalMenuDsl.g:4442:4: ( (lv_default_14_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:4443:5: (lv_default_14_0= ruleXExpression )
+                    // InternalMenuDsl.g:4542:4: ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4543:5: (lv_default_14_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4443:5: (lv_default_14_0= ruleXExpression )
-                    // InternalMenuDsl.g:4444:6: lv_default_14_0= ruleXExpression
+                    // InternalMenuDsl.g:4543:5: (lv_default_14_0= ruleXExpression )
+                    // InternalMenuDsl.g:4544:6: lv_default_14_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12220,7 +12505,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_15=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
+            otherlv_15=(Token)match(input,27,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_15, grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6());
@@ -12251,7 +12536,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // InternalMenuDsl.g:4470:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
+    // InternalMenuDsl.g:4570:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
     public final EObject entryRuleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -12259,8 +12544,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4470:50: (iv_ruleXCasePart= ruleXCasePart EOF )
-            // InternalMenuDsl.g:4471:2: iv_ruleXCasePart= ruleXCasePart EOF
+            // InternalMenuDsl.g:4570:50: (iv_ruleXCasePart= ruleXCasePart EOF )
+            // InternalMenuDsl.g:4571:2: iv_ruleXCasePart= ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCasePartRule()); 
@@ -12291,7 +12576,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCasePart"
-    // InternalMenuDsl.g:4477: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= ',' ) ) ) ) ;
+    // InternalMenuDsl.g:4577: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;
 
@@ -12309,14 +12594,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4483: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= ',' ) ) ) ) )
-            // InternalMenuDsl.g:4484: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= ',' ) ) ) )
+            // InternalMenuDsl.g:4583: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= ',' ) ) ) ) )
+            // InternalMenuDsl.g:4584: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= ',' ) ) ) )
             {
-            // InternalMenuDsl.g:4484: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= ',' ) ) ) )
-            // InternalMenuDsl.g:4485: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= ',' ) ) )
+            // InternalMenuDsl.g:4584: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= ',' ) ) ) )
+            // InternalMenuDsl.g:4585: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= ',' ) ) )
             {
-            // InternalMenuDsl.g:4485:3: ()
-            // InternalMenuDsl.g:4486:4: 
+            // InternalMenuDsl.g:4585:3: ()
+            // InternalMenuDsl.g:4586:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12328,19 +12613,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4492:3: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
-            int alt82=2;
-            int LA82_0 = input.LA(1);
+            // InternalMenuDsl.g:4592:3: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
+            int alt80=2;
+            int LA80_0 = input.LA(1);
 
-            if ( (LA82_0==RULE_ID||LA82_0==39||LA82_0==64) ) {
-                alt82=1;
+            if ( (LA80_0==RULE_ID||LA80_0==41||LA80_0==66) ) {
+                alt80=1;
             }
-            switch (alt82) {
+            switch (alt80) {
                 case 1 :
-                    // InternalMenuDsl.g:4493:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalMenuDsl.g:4593:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
                     {
-                    // InternalMenuDsl.g:4493:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
-                    // InternalMenuDsl.g:4494:5: lv_typeGuard_1_0= ruleJvmTypeReference
+                    // InternalMenuDsl.g:4593:4: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalMenuDsl.g:4594:5: lv_typeGuard_1_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12374,28 +12659,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4511:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
-            int alt83=2;
-            int LA83_0 = input.LA(1);
+            // InternalMenuDsl.g:4611:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
+            int alt81=2;
+            int LA81_0 = input.LA(1);
 
-            if ( (LA83_0==85) ) {
-                alt83=1;
+            if ( (LA81_0==87) ) {
+                alt81=1;
             }
-            switch (alt83) {
+            switch (alt81) {
                 case 1 :
-                    // InternalMenuDsl.g:4512:4: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4612:4: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
                     {
-                    otherlv_2=(Token)match(input,85,FOLLOW_27); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,87,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_2, grammarAccess.getXCasePartAccess().getCaseKeyword_2_0());
                       			
                     }
-                    // InternalMenuDsl.g:4516:4: ( (lv_case_3_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:4517:5: (lv_case_3_0= ruleXExpression )
+                    // InternalMenuDsl.g:4616:4: ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4617:5: (lv_case_3_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4517:5: (lv_case_3_0= ruleXExpression )
-                    // InternalMenuDsl.g:4518:6: lv_case_3_0= ruleXExpression
+                    // InternalMenuDsl.g:4617:5: (lv_case_3_0= ruleXExpression )
+                    // InternalMenuDsl.g:4618:6: lv_case_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12432,41 +12717,41 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4536:3: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
-            int alt84=2;
-            int LA84_0 = input.LA(1);
+            // InternalMenuDsl.g:4636:3: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            int alt82=2;
+            int LA82_0 = input.LA(1);
 
-            if ( (LA84_0==83) ) {
-                alt84=1;
+            if ( (LA82_0==85) ) {
+                alt82=1;
             }
-            else if ( (LA84_0==40) ) {
-                alt84=2;
+            else if ( (LA82_0==42) ) {
+                alt82=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 84, 0, input);
+                    new NoViableAltException("", 82, 0, input);
 
                 throw nvae;
             }
-            switch (alt84) {
+            switch (alt82) {
                 case 1 :
-                    // InternalMenuDsl.g:4537:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalMenuDsl.g:4637:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
                     {
-                    // InternalMenuDsl.g:4537:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
-                    // InternalMenuDsl.g:4538:5: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4637:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalMenuDsl.g:4638:5: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
                     {
-                    otherlv_4=(Token)match(input,83,FOLLOW_27); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,85,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_4, grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0());
                       				
                     }
-                    // InternalMenuDsl.g:4542:5: ( (lv_then_5_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:4543:6: (lv_then_5_0= ruleXExpression )
+                    // InternalMenuDsl.g:4642:5: ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4643:6: (lv_then_5_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4543:6: (lv_then_5_0= ruleXExpression )
-                    // InternalMenuDsl.g:4544:7: lv_then_5_0= ruleXExpression
+                    // InternalMenuDsl.g:4643:6: (lv_then_5_0= ruleXExpression )
+                    // InternalMenuDsl.g:4644:7: lv_then_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12504,15 +12789,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:4563:4: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalMenuDsl.g:4663:4: ( (lv_fallThrough_6_0= ',' ) )
                     {
-                    // InternalMenuDsl.g:4563:4: ( (lv_fallThrough_6_0= ',' ) )
-                    // InternalMenuDsl.g:4564:5: (lv_fallThrough_6_0= ',' )
+                    // InternalMenuDsl.g:4663:4: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalMenuDsl.g:4664:5: (lv_fallThrough_6_0= ',' )
                     {
-                    // InternalMenuDsl.g:4564:5: (lv_fallThrough_6_0= ',' )
-                    // InternalMenuDsl.g:4565:6: lv_fallThrough_6_0= ','
+                    // InternalMenuDsl.g:4664:5: (lv_fallThrough_6_0= ',' )
+                    // InternalMenuDsl.g:4665:6: lv_fallThrough_6_0= ','
                     {
-                    lv_fallThrough_6_0=(Token)match(input,40,FOLLOW_2); if (state.failed) return current;
+                    lv_fallThrough_6_0=(Token)match(input,42,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_fallThrough_6_0, grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0());
@@ -12563,7 +12848,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // InternalMenuDsl.g:4582:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
+    // InternalMenuDsl.g:4682:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
     public final EObject entryRuleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12571,8 +12856,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4582:59: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
-            // InternalMenuDsl.g:4583:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
+            // InternalMenuDsl.g:4682:59: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
+            // InternalMenuDsl.g:4683:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXForLoopExpressionRule()); 
@@ -12603,7 +12888,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // InternalMenuDsl.g:4589: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 ) ) ) ;
+    // InternalMenuDsl.g:4689: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;
 
@@ -12622,20 +12907,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4595: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 ) ) ) )
-            // InternalMenuDsl.g:4596: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 ) ) )
+            // InternalMenuDsl.g:4695: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 ) ) ) )
+            // InternalMenuDsl.g:4696: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 ) ) )
             {
-            // InternalMenuDsl.g:4596: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 ) ) )
-            // InternalMenuDsl.g:4597: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 ) )
+            // InternalMenuDsl.g:4696: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 ) ) )
+            // InternalMenuDsl.g:4697: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 ) )
             {
-            // InternalMenuDsl.g:4597:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-            // InternalMenuDsl.g:4598:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalMenuDsl.g:4697:3: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+            // InternalMenuDsl.g:4698:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
             {
-            // InternalMenuDsl.g:4611:4: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-            // InternalMenuDsl.g:4612:5: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+            // InternalMenuDsl.g:4711:4: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalMenuDsl.g:4712:5: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
             {
-            // InternalMenuDsl.g:4612:5: ()
-            // InternalMenuDsl.g:4613:6: 
+            // InternalMenuDsl.g:4712:5: ()
+            // InternalMenuDsl.g:4713:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12647,23 +12932,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,86,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,88,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_1, grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1());
               				
             }
-            otherlv_2=(Token)match(input,39,FOLLOW_40); if (state.failed) return current;
+            otherlv_2=(Token)match(input,41,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_2, grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2());
               				
             }
-            // InternalMenuDsl.g:4627:5: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-            // InternalMenuDsl.g:4628:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalMenuDsl.g:4727:5: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+            // InternalMenuDsl.g:4728:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
             {
-            // InternalMenuDsl.g:4628:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-            // InternalMenuDsl.g:4629:7: lv_declaredParam_3_0= ruleJvmFormalParameter
+            // InternalMenuDsl.g:4728:6: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalMenuDsl.g:4729:7: lv_declaredParam_3_0= ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
 
@@ -12694,7 +12979,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,83,FOLLOW_27); if (state.failed) return current;
+            otherlv_4=(Token)match(input,85,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_4, grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4());
@@ -12706,18 +12991,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:4652:3: ( (lv_forExpression_5_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4653:4: (lv_forExpression_5_0= ruleXExpression )
+            // InternalMenuDsl.g:4752:3: ( (lv_forExpression_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4753:4: (lv_forExpression_5_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4653:4: (lv_forExpression_5_0= ruleXExpression )
-            // InternalMenuDsl.g:4654:5: lv_forExpression_5_0= ruleXExpression
+            // InternalMenuDsl.g:4753:4: (lv_forExpression_5_0= ruleXExpression )
+            // InternalMenuDsl.g:4754:5: lv_forExpression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0());
               				
             }
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_26);
             lv_forExpression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -12741,17 +13026,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,41,FOLLOW_27); if (state.failed) return current;
+            otherlv_6=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2());
               		
             }
-            // InternalMenuDsl.g:4675:3: ( (lv_eachExpression_7_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4676:4: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalMenuDsl.g:4775:3: ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4776:4: (lv_eachExpression_7_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4676:4: (lv_eachExpression_7_0= ruleXExpression )
-            // InternalMenuDsl.g:4677:5: lv_eachExpression_7_0= ruleXExpression
+            // InternalMenuDsl.g:4776:4: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalMenuDsl.g:4777:5: lv_eachExpression_7_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -12807,7 +13092,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // InternalMenuDsl.g:4698:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
+    // InternalMenuDsl.g:4798:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
     public final EObject entryRuleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12815,8 +13100,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4698:64: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
-            // InternalMenuDsl.g:4699:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
+            // InternalMenuDsl.g:4798:64: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
+            // InternalMenuDsl.g:4799:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBasicForLoopExpressionRule()); 
@@ -12847,7 +13132,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // InternalMenuDsl.g:4705: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 ) ) ) ;
+    // InternalMenuDsl.g:4805: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;
 
@@ -12875,14 +13160,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4711: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 ) ) ) )
-            // InternalMenuDsl.g:4712: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 ) ) )
+            // InternalMenuDsl.g:4811: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 ) ) ) )
+            // InternalMenuDsl.g:4812: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 ) ) )
             {
-            // InternalMenuDsl.g:4712: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 ) ) )
-            // InternalMenuDsl.g:4713: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 ) )
+            // InternalMenuDsl.g:4812: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 ) ) )
+            // InternalMenuDsl.g:4813: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 ) )
             {
-            // InternalMenuDsl.g:4713:3: ()
-            // InternalMenuDsl.g:4714:4: 
+            // InternalMenuDsl.g:4813:3: ()
+            // InternalMenuDsl.g:4814:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12894,34 +13179,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,86,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,88,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,39,FOLLOW_74); if (state.failed) return current;
+            otherlv_2=(Token)match(input,41,FOLLOW_74); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalMenuDsl.g:4728:3: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
-            int alt86=2;
-            int LA86_0 = input.LA(1);
+            // InternalMenuDsl.g:4828:3: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
+            int alt84=2;
+            int LA84_0 = input.LA(1);
 
-            if ( ((LA86_0>=RULE_STRING && LA86_0<=RULE_DECIMAL)||LA86_0==14||(LA86_0>=32 && LA86_0<=34)||LA86_0==39||(LA86_0>=43 && LA86_0<=44)||LA86_0==51||(LA86_0>=67 && LA86_0<=68)||LA86_0==72||LA86_0==80||LA86_0==82||(LA86_0>=86 && LA86_0<=100)||LA86_0==102) ) {
-                alt86=1;
+            if ( ((LA84_0>=RULE_STRING && LA84_0<=RULE_DECIMAL)||LA84_0==26||(LA84_0>=34 && LA84_0<=36)||LA84_0==41||(LA84_0>=45 && LA84_0<=46)||LA84_0==53||(LA84_0>=69 && LA84_0<=70)||LA84_0==74||LA84_0==82||LA84_0==84||(LA84_0>=88 && LA84_0<=102)||LA84_0==104) ) {
+                alt84=1;
             }
-            switch (alt86) {
+            switch (alt84) {
                 case 1 :
-                    // InternalMenuDsl.g:4729:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalMenuDsl.g:4829:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     {
-                    // InternalMenuDsl.g:4729:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
-                    // InternalMenuDsl.g:4730:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalMenuDsl.g:4829:4: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
+                    // InternalMenuDsl.g:4830:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
                     {
-                    // InternalMenuDsl.g:4730:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
-                    // InternalMenuDsl.g:4731:6: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
+                    // InternalMenuDsl.g:4830:5: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalMenuDsl.g:4831:6: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12952,32 +13237,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:4748:4: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
-                    loop85:
+                    // InternalMenuDsl.g:4848:4: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    loop83:
                     do {
-                        int alt85=2;
-                        int LA85_0 = input.LA(1);
+                        int alt83=2;
+                        int LA83_0 = input.LA(1);
 
-                        if ( (LA85_0==40) ) {
-                            alt85=1;
+                        if ( (LA83_0==42) ) {
+                            alt83=1;
                         }
 
 
-                        switch (alt85) {
+                        switch (alt83) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:4749:5: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalMenuDsl.g:4849:5: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,40,FOLLOW_76); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,42,FOLLOW_76); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_4, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0());
                     	      				
                     	    }
-                    	    // InternalMenuDsl.g:4753:5: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
-                    	    // InternalMenuDsl.g:4754:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalMenuDsl.g:4853:5: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalMenuDsl.g:4854:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
                     	    {
-                    	    // InternalMenuDsl.g:4754:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
-                    	    // InternalMenuDsl.g:4755:7: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
+                    	    // InternalMenuDsl.g:4854:6: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalMenuDsl.g:4855:7: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -13013,7 +13298,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop85;
+                    	    break loop83;
                         }
                     } while (true);
 
@@ -13023,25 +13308,25 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,37,FOLLOW_77); if (state.failed) return current;
+            otherlv_6=(Token)match(input,39,FOLLOW_77); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4());
               		
             }
-            // InternalMenuDsl.g:4778:3: ( (lv_expression_7_0= ruleXExpression ) )?
-            int alt87=2;
-            int LA87_0 = input.LA(1);
+            // InternalMenuDsl.g:4878:3: ( (lv_expression_7_0= ruleXExpression ) )?
+            int alt85=2;
+            int LA85_0 = input.LA(1);
 
-            if ( ((LA87_0>=RULE_STRING && LA87_0<=RULE_DECIMAL)||LA87_0==14||(LA87_0>=32 && LA87_0<=34)||LA87_0==39||(LA87_0>=43 && LA87_0<=44)||LA87_0==51||(LA87_0>=67 && LA87_0<=68)||LA87_0==72||LA87_0==80||LA87_0==82||(LA87_0>=86 && LA87_0<=88)||(LA87_0>=91 && LA87_0<=100)||LA87_0==102) ) {
-                alt87=1;
+            if ( ((LA85_0>=RULE_STRING && LA85_0<=RULE_DECIMAL)||LA85_0==26||(LA85_0>=34 && LA85_0<=36)||LA85_0==41||(LA85_0>=45 && LA85_0<=46)||LA85_0==53||(LA85_0>=69 && LA85_0<=70)||LA85_0==74||LA85_0==82||LA85_0==84||(LA85_0>=88 && LA85_0<=90)||(LA85_0>=93 && LA85_0<=102)||LA85_0==104) ) {
+                alt85=1;
             }
-            switch (alt87) {
+            switch (alt85) {
                 case 1 :
-                    // InternalMenuDsl.g:4779:4: (lv_expression_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:4879:4: (lv_expression_7_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4779:4: (lv_expression_7_0= ruleXExpression )
-                    // InternalMenuDsl.g:4780:5: lv_expression_7_0= ruleXExpression
+                    // InternalMenuDsl.g:4879:4: (lv_expression_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:4880:5: lv_expression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -13075,35 +13360,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_8=(Token)match(input,37,FOLLOW_23); if (state.failed) return current;
+            otherlv_8=(Token)match(input,39,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_8, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6());
               		
             }
-            // InternalMenuDsl.g:4801:3: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
-            int alt89=2;
-            int LA89_0 = input.LA(1);
+            // InternalMenuDsl.g:4901:3: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
+            int alt87=2;
+            int LA87_0 = input.LA(1);
 
-            if ( ((LA89_0>=RULE_STRING && LA89_0<=RULE_DECIMAL)||LA89_0==14||(LA89_0>=32 && LA89_0<=34)||LA89_0==39||(LA89_0>=43 && LA89_0<=44)||LA89_0==51||(LA89_0>=67 && LA89_0<=68)||LA89_0==72||LA89_0==80||LA89_0==82||(LA89_0>=86 && LA89_0<=88)||(LA89_0>=91 && LA89_0<=100)||LA89_0==102) ) {
-                alt89=1;
+            if ( ((LA87_0>=RULE_STRING && LA87_0<=RULE_DECIMAL)||LA87_0==26||(LA87_0>=34 && LA87_0<=36)||LA87_0==41||(LA87_0>=45 && LA87_0<=46)||LA87_0==53||(LA87_0>=69 && LA87_0<=70)||LA87_0==74||LA87_0==82||LA87_0==84||(LA87_0>=88 && LA87_0<=90)||(LA87_0>=93 && LA87_0<=102)||LA87_0==104) ) {
+                alt87=1;
             }
-            switch (alt89) {
+            switch (alt87) {
                 case 1 :
-                    // InternalMenuDsl.g:4802:4: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalMenuDsl.g:4902:4: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     {
-                    // InternalMenuDsl.g:4802:4: ( (lv_updateExpressions_9_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:4803:5: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalMenuDsl.g:4902:4: ( (lv_updateExpressions_9_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:4903:5: (lv_updateExpressions_9_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:4803:5: (lv_updateExpressions_9_0= ruleXExpression )
-                    // InternalMenuDsl.g:4804:6: lv_updateExpressions_9_0= ruleXExpression
+                    // InternalMenuDsl.g:4903:5: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalMenuDsl.g:4904:6: lv_updateExpressions_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0());
                       					
                     }
-                    pushFollow(FOLLOW_24);
+                    pushFollow(FOLLOW_25);
                     lv_updateExpressions_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -13127,39 +13412,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:4821:4: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
-                    loop88:
+                    // InternalMenuDsl.g:4921:4: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    loop86:
                     do {
-                        int alt88=2;
-                        int LA88_0 = input.LA(1);
+                        int alt86=2;
+                        int LA86_0 = input.LA(1);
 
-                        if ( (LA88_0==40) ) {
-                            alt88=1;
+                        if ( (LA86_0==42) ) {
+                            alt86=1;
                         }
 
 
-                        switch (alt88) {
+                        switch (alt86) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:4822:5: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalMenuDsl.g:4922:5: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_10=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                    	    otherlv_10=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_10, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0());
                     	      				
                     	    }
-                    	    // InternalMenuDsl.g:4826:5: ( (lv_updateExpressions_11_0= ruleXExpression ) )
-                    	    // InternalMenuDsl.g:4827:6: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalMenuDsl.g:4926:5: ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalMenuDsl.g:4927:6: (lv_updateExpressions_11_0= ruleXExpression )
                     	    {
-                    	    // InternalMenuDsl.g:4827:6: (lv_updateExpressions_11_0= ruleXExpression )
-                    	    // InternalMenuDsl.g:4828:7: lv_updateExpressions_11_0= ruleXExpression
+                    	    // InternalMenuDsl.g:4927:6: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalMenuDsl.g:4928:7: lv_updateExpressions_11_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_24);
+                    	    pushFollow(FOLLOW_25);
                     	    lv_updateExpressions_11_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -13188,7 +13473,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop88;
+                    	    break loop86;
                         }
                     } while (true);
 
@@ -13198,17 +13483,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_12=(Token)match(input,41,FOLLOW_27); if (state.failed) return current;
+            otherlv_12=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_12, grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8());
               		
             }
-            // InternalMenuDsl.g:4851:3: ( (lv_eachExpression_13_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4852:4: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalMenuDsl.g:4951:3: ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4952:4: (lv_eachExpression_13_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4852:4: (lv_eachExpression_13_0= ruleXExpression )
-            // InternalMenuDsl.g:4853:5: lv_eachExpression_13_0= ruleXExpression
+            // InternalMenuDsl.g:4952:4: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalMenuDsl.g:4953:5: lv_eachExpression_13_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -13264,7 +13549,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // InternalMenuDsl.g:4874:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
+    // InternalMenuDsl.g:4974:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
     public final EObject entryRuleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -13272,8 +13557,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4874:57: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
-            // InternalMenuDsl.g:4875:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
+            // InternalMenuDsl.g:4974:57: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
+            // InternalMenuDsl.g:4975:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXWhileExpressionRule()); 
@@ -13304,7 +13589,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // InternalMenuDsl.g:4881:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
+    // InternalMenuDsl.g:4981: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;
 
@@ -13320,14 +13605,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4887:2: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
-            // InternalMenuDsl.g:4888:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:4987:2: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
+            // InternalMenuDsl.g:4988:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
             {
-            // InternalMenuDsl.g:4888:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
-            // InternalMenuDsl.g:4889:3: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:4988:2: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:4989:3: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
             {
-            // InternalMenuDsl.g:4889:3: ()
-            // InternalMenuDsl.g:4890:4: 
+            // InternalMenuDsl.g:4989:3: ()
+            // InternalMenuDsl.g:4990:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13339,30 +13624,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,87,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,89,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,39,FOLLOW_27); if (state.failed) return current;
+            otherlv_2=(Token)match(input,41,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalMenuDsl.g:4904:3: ( (lv_predicate_3_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4905:4: (lv_predicate_3_0= ruleXExpression )
+            // InternalMenuDsl.g:5004:3: ( (lv_predicate_3_0= ruleXExpression ) )
+            // InternalMenuDsl.g:5005:4: (lv_predicate_3_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4905:4: (lv_predicate_3_0= ruleXExpression )
-            // InternalMenuDsl.g:4906:5: lv_predicate_3_0= ruleXExpression
+            // InternalMenuDsl.g:5005:4: (lv_predicate_3_0= ruleXExpression )
+            // InternalMenuDsl.g:5006:5: lv_predicate_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0());
               				
             }
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_26);
             lv_predicate_3_0=ruleXExpression();
 
             state._fsp--;
@@ -13386,17 +13671,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,41,FOLLOW_27); if (state.failed) return current;
+            otherlv_4=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4());
               		
             }
-            // InternalMenuDsl.g:4927:3: ( (lv_body_5_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4928:4: (lv_body_5_0= ruleXExpression )
+            // InternalMenuDsl.g:5027:3: ( (lv_body_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:5028:4: (lv_body_5_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4928:4: (lv_body_5_0= ruleXExpression )
-            // InternalMenuDsl.g:4929:5: lv_body_5_0= ruleXExpression
+            // InternalMenuDsl.g:5028:4: (lv_body_5_0= ruleXExpression )
+            // InternalMenuDsl.g:5029:5: lv_body_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -13452,7 +13737,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // InternalMenuDsl.g:4950:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
+    // InternalMenuDsl.g:5050:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
     public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -13460,8 +13745,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:4950:59: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
-            // InternalMenuDsl.g:4951:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
+            // InternalMenuDsl.g:5050:59: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
+            // InternalMenuDsl.g:5051:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXDoWhileExpressionRule()); 
@@ -13492,7 +13777,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // InternalMenuDsl.g:4957: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= ')' ) ;
+    // InternalMenuDsl.g:5057: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;
 
@@ -13509,14 +13794,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:4963:2: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
-            // InternalMenuDsl.g:4964:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalMenuDsl.g:5063:2: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
+            // InternalMenuDsl.g:5064:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
             {
-            // InternalMenuDsl.g:4964:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
-            // InternalMenuDsl.g:4965:3: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
+            // InternalMenuDsl.g:5064:2: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalMenuDsl.g:5065:3: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
             {
-            // InternalMenuDsl.g:4965:3: ()
-            // InternalMenuDsl.g:4966:4: 
+            // InternalMenuDsl.g:5065:3: ()
+            // InternalMenuDsl.g:5066:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13528,17 +13813,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,88,FOLLOW_27); if (state.failed) return current;
+            otherlv_1=(Token)match(input,90,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1());
               		
             }
-            // InternalMenuDsl.g:4976:3: ( (lv_body_2_0= ruleXExpression ) )
-            // InternalMenuDsl.g:4977:4: (lv_body_2_0= ruleXExpression )
+            // InternalMenuDsl.g:5076:3: ( (lv_body_2_0= ruleXExpression ) )
+            // InternalMenuDsl.g:5077:4: (lv_body_2_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:4977:4: (lv_body_2_0= ruleXExpression )
-            // InternalMenuDsl.g:4978:5: lv_body_2_0= ruleXExpression
+            // InternalMenuDsl.g:5077:4: (lv_body_2_0= ruleXExpression )
+            // InternalMenuDsl.g:5078:5: lv_body_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -13569,30 +13854,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,87,FOLLOW_66); if (state.failed) return current;
+            otherlv_3=(Token)match(input,89,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_3, grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3());
               		
             }
-            otherlv_4=(Token)match(input,39,FOLLOW_27); if (state.failed) return current;
+            otherlv_4=(Token)match(input,41,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4());
               		
             }
-            // InternalMenuDsl.g:5003:3: ( (lv_predicate_5_0= ruleXExpression ) )
-            // InternalMenuDsl.g:5004:4: (lv_predicate_5_0= ruleXExpression )
+            // InternalMenuDsl.g:5103:3: ( (lv_predicate_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:5104:4: (lv_predicate_5_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:5004:4: (lv_predicate_5_0= ruleXExpression )
-            // InternalMenuDsl.g:5005:5: lv_predicate_5_0= ruleXExpression
+            // InternalMenuDsl.g:5104:4: (lv_predicate_5_0= ruleXExpression )
+            // InternalMenuDsl.g:5105:5: lv_predicate_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0());
               				
             }
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_26);
             lv_predicate_5_0=ruleXExpression();
 
             state._fsp--;
@@ -13616,7 +13901,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,41,FOLLOW_2); if (state.failed) return current;
+            otherlv_6=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_6, grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6());
@@ -13647,7 +13932,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // InternalMenuDsl.g:5030:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
+    // InternalMenuDsl.g:5130:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
     public final EObject entryRuleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -13655,8 +13940,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5030:57: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
-            // InternalMenuDsl.g:5031:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
+            // InternalMenuDsl.g:5130:57: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
+            // InternalMenuDsl.g:5131:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBlockExpressionRule()); 
@@ -13687,7 +13972,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // InternalMenuDsl.g:5037:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
+    // InternalMenuDsl.g:5137: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;
 
@@ -13701,14 +13986,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5043:2: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
-            // InternalMenuDsl.g:5044:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalMenuDsl.g:5143:2: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
+            // InternalMenuDsl.g:5144:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
             {
-            // InternalMenuDsl.g:5044:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
-            // InternalMenuDsl.g:5045:3: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
+            // InternalMenuDsl.g:5144:2: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalMenuDsl.g:5145:3: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
             {
-            // InternalMenuDsl.g:5045:3: ()
-            // InternalMenuDsl.g:5046:4: 
+            // InternalMenuDsl.g:5145:3: ()
+            // InternalMenuDsl.g:5146:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13720,32 +14005,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,14,FOLLOW_80); if (state.failed) return current;
+            otherlv_1=(Token)match(input,26,FOLLOW_80); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1());
               		
             }
-            // InternalMenuDsl.g:5056:3: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
-            loop91:
+            // InternalMenuDsl.g:5156:3: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
+            loop89:
             do {
-                int alt91=2;
-                int LA91_0 = input.LA(1);
+                int alt89=2;
+                int LA89_0 = input.LA(1);
 
-                if ( ((LA91_0>=RULE_STRING && LA91_0<=RULE_DECIMAL)||LA91_0==14||(LA91_0>=32 && LA91_0<=34)||LA91_0==39||(LA91_0>=43 && LA91_0<=44)||LA91_0==51||(LA91_0>=67 && LA91_0<=68)||LA91_0==72||LA91_0==80||LA91_0==82||(LA91_0>=86 && LA91_0<=100)||LA91_0==102) ) {
-                    alt91=1;
+                if ( ((LA89_0>=RULE_STRING && LA89_0<=RULE_DECIMAL)||LA89_0==26||(LA89_0>=34 && LA89_0<=36)||LA89_0==41||(LA89_0>=45 && LA89_0<=46)||LA89_0==53||(LA89_0>=69 && LA89_0<=70)||LA89_0==74||LA89_0==82||LA89_0==84||(LA89_0>=88 && LA89_0<=102)||LA89_0==104) ) {
+                    alt89=1;
                 }
 
 
-                switch (alt91) {
+                switch (alt89) {
             	case 1 :
-            	    // InternalMenuDsl.g:5057:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
+            	    // InternalMenuDsl.g:5157:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
             	    {
-            	    // InternalMenuDsl.g:5057:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
-            	    // InternalMenuDsl.g:5058:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalMenuDsl.g:5157:4: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalMenuDsl.g:5158:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // InternalMenuDsl.g:5058:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
-            	    // InternalMenuDsl.g:5059:6: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
+            	    // InternalMenuDsl.g:5158:5: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalMenuDsl.g:5159:6: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -13776,18 +14061,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             	    }
 
-            	    // InternalMenuDsl.g:5076:4: (otherlv_3= ';' )?
-            	    int alt90=2;
-            	    int LA90_0 = input.LA(1);
+            	    // InternalMenuDsl.g:5176:4: (otherlv_3= ';' )?
+            	    int alt88=2;
+            	    int LA88_0 = input.LA(1);
 
-            	    if ( (LA90_0==37) ) {
-            	        alt90=1;
+            	    if ( (LA88_0==39) ) {
+            	        alt88=1;
             	    }
-            	    switch (alt90) {
+            	    switch (alt88) {
             	        case 1 :
-            	            // InternalMenuDsl.g:5077:5: otherlv_3= ';'
+            	            // InternalMenuDsl.g:5177:5: otherlv_3= ';'
             	            {
-            	            otherlv_3=(Token)match(input,37,FOLLOW_80); if (state.failed) return current;
+            	            otherlv_3=(Token)match(input,39,FOLLOW_80); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	              					newLeafNode(otherlv_3, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1());
@@ -13804,11 +14089,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop91;
+            	    break loop89;
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
+            otherlv_4=(Token)match(input,27,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3());
@@ -13839,7 +14124,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // InternalMenuDsl.g:5091:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
+    // InternalMenuDsl.g:5191:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
     public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -13847,8 +14132,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5091:68: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
-            // InternalMenuDsl.g:5092:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
+            // InternalMenuDsl.g:5191:68: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
+            // InternalMenuDsl.g:5192:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationRule()); 
@@ -13879,7 +14164,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // InternalMenuDsl.g:5098:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
+    // InternalMenuDsl.g:5198:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -13892,29 +14177,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5104:2: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
-            // InternalMenuDsl.g:5105:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalMenuDsl.g:5204:2: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
+            // InternalMenuDsl.g:5205:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             {
-            // InternalMenuDsl.g:5105:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
-            int alt92=2;
-            int LA92_0 = input.LA(1);
+            // InternalMenuDsl.g:5205:2: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            int alt90=2;
+            int LA90_0 = input.LA(1);
 
-            if ( ((LA92_0>=89 && LA92_0<=90)) ) {
-                alt92=1;
+            if ( ((LA90_0>=91 && LA90_0<=92)) ) {
+                alt90=1;
             }
-            else if ( ((LA92_0>=RULE_STRING && LA92_0<=RULE_DECIMAL)||LA92_0==14||(LA92_0>=32 && LA92_0<=34)||LA92_0==39||(LA92_0>=43 && LA92_0<=44)||LA92_0==51||(LA92_0>=67 && LA92_0<=68)||LA92_0==72||LA92_0==80||LA92_0==82||(LA92_0>=86 && LA92_0<=88)||(LA92_0>=91 && LA92_0<=100)||LA92_0==102) ) {
-                alt92=2;
+            else if ( ((LA90_0>=RULE_STRING && LA90_0<=RULE_DECIMAL)||LA90_0==26||(LA90_0>=34 && LA90_0<=36)||LA90_0==41||(LA90_0>=45 && LA90_0<=46)||LA90_0==53||(LA90_0>=69 && LA90_0<=70)||LA90_0==74||LA90_0==82||LA90_0==84||(LA90_0>=88 && LA90_0<=90)||(LA90_0>=93 && LA90_0<=102)||LA90_0==104) ) {
+                alt90=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 92, 0, input);
+                    new NoViableAltException("", 90, 0, input);
 
                 throw nvae;
             }
-            switch (alt92) {
+            switch (alt90) {
                 case 1 :
-                    // InternalMenuDsl.g:5106:3: this_XVariableDeclaration_0= ruleXVariableDeclaration
+                    // InternalMenuDsl.g:5206:3: this_XVariableDeclaration_0= ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
 
@@ -13936,7 +14221,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:5115:3: this_XExpression_1= ruleXExpression
+                    // InternalMenuDsl.g:5215:3: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -13982,7 +14267,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // InternalMenuDsl.g:5127:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
+    // InternalMenuDsl.g:5227:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
     public final EObject entryRuleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -13990,8 +14275,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5127:61: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
-            // InternalMenuDsl.g:5128:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
+            // InternalMenuDsl.g:5227:61: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
+            // InternalMenuDsl.g:5228:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXVariableDeclarationRule()); 
@@ -14022,7 +14307,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // InternalMenuDsl.g:5134: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 ) ) )? ) ;
+    // InternalMenuDsl.g:5234: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;
 
@@ -14042,14 +14327,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5140: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 ) ) )? ) )
-            // InternalMenuDsl.g:5141: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 ) ) )? )
+            // InternalMenuDsl.g:5240: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 ) ) )? ) )
+            // InternalMenuDsl.g:5241: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 ) ) )? )
             {
-            // InternalMenuDsl.g:5141: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 ) ) )? )
-            // InternalMenuDsl.g:5142: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 ) ) )?
+            // InternalMenuDsl.g:5241: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 ) ) )? )
+            // InternalMenuDsl.g:5242: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 ) ) )?
             {
-            // InternalMenuDsl.g:5142:3: ()
-            // InternalMenuDsl.g:5143:4: 
+            // InternalMenuDsl.g:5242:3: ()
+            // InternalMenuDsl.g:5243:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14061,34 +14346,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5149:3: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
-            int alt93=2;
-            int LA93_0 = input.LA(1);
+            // InternalMenuDsl.g:5249:3: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
+            int alt91=2;
+            int LA91_0 = input.LA(1);
 
-            if ( (LA93_0==89) ) {
-                alt93=1;
+            if ( (LA91_0==91) ) {
+                alt91=1;
             }
-            else if ( (LA93_0==90) ) {
-                alt93=2;
+            else if ( (LA91_0==92) ) {
+                alt91=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 93, 0, input);
+                    new NoViableAltException("", 91, 0, input);
 
                 throw nvae;
             }
-            switch (alt93) {
+            switch (alt91) {
                 case 1 :
-                    // InternalMenuDsl.g:5150:4: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalMenuDsl.g:5250:4: ( (lv_writeable_1_0= 'var' ) )
                     {
-                    // InternalMenuDsl.g:5150:4: ( (lv_writeable_1_0= 'var' ) )
-                    // InternalMenuDsl.g:5151:5: (lv_writeable_1_0= 'var' )
+                    // InternalMenuDsl.g:5250:4: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalMenuDsl.g:5251:5: (lv_writeable_1_0= 'var' )
                     {
-                    // InternalMenuDsl.g:5151:5: (lv_writeable_1_0= 'var' )
-                    // InternalMenuDsl.g:5152:6: lv_writeable_1_0= 'var'
+                    // InternalMenuDsl.g:5251:5: (lv_writeable_1_0= 'var' )
+                    // InternalMenuDsl.g:5252:6: lv_writeable_1_0= 'var'
                     {
-                    lv_writeable_1_0=(Token)match(input,89,FOLLOW_40); if (state.failed) return current;
+                    lv_writeable_1_0=(Token)match(input,91,FOLLOW_41); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_writeable_1_0, grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0());
@@ -14112,9 +14397,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:5165:4: otherlv_2= 'val'
+                    // InternalMenuDsl.g:5265:4: otherlv_2= 'val'
                     {
-                    otherlv_2=(Token)match(input,90,FOLLOW_40); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,92,FOLLOW_41); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_2, grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1());
@@ -14126,55 +14411,55 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5170:3: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
-            int alt94=2;
-            int LA94_0 = input.LA(1);
+            // InternalMenuDsl.g:5270:3: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
+            int alt92=2;
+            int LA92_0 = input.LA(1);
 
-            if ( (LA94_0==RULE_ID) ) {
-                int LA94_1 = input.LA(2);
+            if ( (LA92_0==RULE_ID) ) {
+                int LA92_1 = input.LA(2);
 
                 if ( (synpred35_InternalMenuDsl()) ) {
-                    alt94=1;
+                    alt92=1;
                 }
                 else if ( (true) ) {
-                    alt94=2;
+                    alt92=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 94, 1, input);
+                        new NoViableAltException("", 92, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA94_0==39) && (synpred35_InternalMenuDsl())) {
-                alt94=1;
+            else if ( (LA92_0==41) && (synpred35_InternalMenuDsl())) {
+                alt92=1;
             }
-            else if ( (LA94_0==64) && (synpred35_InternalMenuDsl())) {
-                alt94=1;
+            else if ( (LA92_0==66) && (synpred35_InternalMenuDsl())) {
+                alt92=1;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 94, 0, input);
+                    new NoViableAltException("", 92, 0, input);
 
                 throw nvae;
             }
-            switch (alt94) {
+            switch (alt92) {
                 case 1 :
-                    // InternalMenuDsl.g:5171:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalMenuDsl.g:5271:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
                     {
-                    // InternalMenuDsl.g:5171:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
-                    // InternalMenuDsl.g:5172:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalMenuDsl.g:5271:4: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalMenuDsl.g:5272:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
                     {
-                    // InternalMenuDsl.g:5185:5: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
-                    // InternalMenuDsl.g:5186:6: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
+                    // InternalMenuDsl.g:5285:5: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalMenuDsl.g:5286:6: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
                     {
-                    // InternalMenuDsl.g:5186:6: ( (lv_type_3_0= ruleJvmTypeReference ) )
-                    // InternalMenuDsl.g:5187:7: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalMenuDsl.g:5286:6: ( (lv_type_3_0= ruleJvmTypeReference ) )
+                    // InternalMenuDsl.g:5287:7: (lv_type_3_0= ruleJvmTypeReference )
                     {
-                    // InternalMenuDsl.g:5187:7: (lv_type_3_0= ruleJvmTypeReference )
-                    // InternalMenuDsl.g:5188:8: lv_type_3_0= ruleJvmTypeReference
+                    // InternalMenuDsl.g:5287:7: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalMenuDsl.g:5288:8: lv_type_3_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -14205,11 +14490,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:5205:6: ( (lv_name_4_0= ruleValidID ) )
-                    // InternalMenuDsl.g:5206:7: (lv_name_4_0= ruleValidID )
+                    // InternalMenuDsl.g:5305:6: ( (lv_name_4_0= ruleValidID ) )
+                    // InternalMenuDsl.g:5306:7: (lv_name_4_0= ruleValidID )
                     {
-                    // InternalMenuDsl.g:5206:7: (lv_name_4_0= ruleValidID )
-                    // InternalMenuDsl.g:5207:8: lv_name_4_0= ruleValidID
+                    // InternalMenuDsl.g:5306:7: (lv_name_4_0= ruleValidID )
+                    // InternalMenuDsl.g:5307:8: lv_name_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -14250,13 +14535,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:5227:4: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalMenuDsl.g:5327:4: ( (lv_name_5_0= ruleValidID ) )
                     {
-                    // InternalMenuDsl.g:5227:4: ( (lv_name_5_0= ruleValidID ) )
-                    // InternalMenuDsl.g:5228:5: (lv_name_5_0= ruleValidID )
+                    // InternalMenuDsl.g:5327:4: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalMenuDsl.g:5328:5: (lv_name_5_0= ruleValidID )
                     {
-                    // InternalMenuDsl.g:5228:5: (lv_name_5_0= ruleValidID )
-                    // InternalMenuDsl.g:5229:6: lv_name_5_0= ruleValidID
+                    // InternalMenuDsl.g:5328:5: (lv_name_5_0= ruleValidID )
+                    // InternalMenuDsl.g:5329:6: lv_name_5_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -14293,28 +14578,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5247:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
-            int alt95=2;
-            int LA95_0 = input.LA(1);
+            // InternalMenuDsl.g:5347:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            int alt93=2;
+            int LA93_0 = input.LA(1);
 
-            if ( (LA95_0==42) ) {
-                alt95=1;
+            if ( (LA93_0==44) ) {
+                alt93=1;
             }
-            switch (alt95) {
+            switch (alt93) {
                 case 1 :
-                    // InternalMenuDsl.g:5248:4: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:5348:4: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,42,FOLLOW_27); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,44,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_6, grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0());
                       			
                     }
-                    // InternalMenuDsl.g:5252:4: ( (lv_right_7_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:5253:5: (lv_right_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:5352:4: ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:5353:5: (lv_right_7_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:5253:5: (lv_right_7_0= ruleXExpression )
-                    // InternalMenuDsl.g:5254:6: lv_right_7_0= ruleXExpression
+                    // InternalMenuDsl.g:5353:5: (lv_right_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:5354:6: lv_right_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -14376,7 +14661,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // InternalMenuDsl.g:5276:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
+    // InternalMenuDsl.g:5376:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
     public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -14384,8 +14669,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5276:59: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
-            // InternalMenuDsl.g:5277:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
+            // InternalMenuDsl.g:5376:59: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
+            // InternalMenuDsl.g:5377:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmFormalParameterRule()); 
@@ -14416,7 +14701,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // InternalMenuDsl.g:5283:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalMenuDsl.g:5383: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;
 
@@ -14429,32 +14714,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5289:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
-            // InternalMenuDsl.g:5290:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalMenuDsl.g:5389:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalMenuDsl.g:5390:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // InternalMenuDsl.g:5290:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
-            // InternalMenuDsl.g:5291:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
+            // InternalMenuDsl.g:5390:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalMenuDsl.g:5391:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
             {
-            // InternalMenuDsl.g:5291:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
-            int alt96=2;
-            int LA96_0 = input.LA(1);
+            // InternalMenuDsl.g:5391:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
+            int alt94=2;
+            int LA94_0 = input.LA(1);
 
-            if ( (LA96_0==RULE_ID) ) {
-                int LA96_1 = input.LA(2);
+            if ( (LA94_0==RULE_ID) ) {
+                int LA94_1 = input.LA(2);
 
-                if ( (LA96_1==RULE_ID||LA96_1==44||LA96_1==51||LA96_1==76) ) {
-                    alt96=1;
+                if ( (LA94_1==RULE_ID||LA94_1==46||LA94_1==53||LA94_1==78) ) {
+                    alt94=1;
                 }
             }
-            else if ( (LA96_0==39||LA96_0==64) ) {
-                alt96=1;
+            else if ( (LA94_0==41||LA94_0==66) ) {
+                alt94=1;
             }
-            switch (alt96) {
+            switch (alt94) {
                 case 1 :
-                    // InternalMenuDsl.g:5292:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalMenuDsl.g:5392:4: (lv_parameterType_0_0= ruleJvmTypeReference )
                     {
-                    // InternalMenuDsl.g:5292:4: (lv_parameterType_0_0= ruleJvmTypeReference )
-                    // InternalMenuDsl.g:5293:5: lv_parameterType_0_0= ruleJvmTypeReference
+                    // InternalMenuDsl.g:5392:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalMenuDsl.g:5393:5: lv_parameterType_0_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -14488,11 +14773,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5310:3: ( (lv_name_1_0= ruleValidID ) )
-            // InternalMenuDsl.g:5311:4: (lv_name_1_0= ruleValidID )
+            // InternalMenuDsl.g:5410:3: ( (lv_name_1_0= ruleValidID ) )
+            // InternalMenuDsl.g:5411:4: (lv_name_1_0= ruleValidID )
             {
-            // InternalMenuDsl.g:5311:4: (lv_name_1_0= ruleValidID )
-            // InternalMenuDsl.g:5312:5: lv_name_1_0= ruleValidID
+            // InternalMenuDsl.g:5411:4: (lv_name_1_0= ruleValidID )
+            // InternalMenuDsl.g:5412:5: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -14548,7 +14833,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // InternalMenuDsl.g:5333:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
+    // InternalMenuDsl.g:5433:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
     public final EObject entryRuleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -14556,8 +14841,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5333:63: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
-            // InternalMenuDsl.g:5334:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
+            // InternalMenuDsl.g:5433:63: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
+            // InternalMenuDsl.g:5434:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFullJvmFormalParameterRule()); 
@@ -14588,7 +14873,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // InternalMenuDsl.g:5340:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalMenuDsl.g:5440: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;
 
@@ -14601,17 +14886,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5346:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
-            // InternalMenuDsl.g:5347:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalMenuDsl.g:5446:2: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalMenuDsl.g:5447:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // InternalMenuDsl.g:5347:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
-            // InternalMenuDsl.g:5348:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
+            // InternalMenuDsl.g:5447:2: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalMenuDsl.g:5448:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
             {
-            // InternalMenuDsl.g:5348:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:5349:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:5448:3: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:5449:4: (lv_parameterType_0_0= ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:5349:4: (lv_parameterType_0_0= ruleJvmTypeReference )
-            // InternalMenuDsl.g:5350:5: lv_parameterType_0_0= ruleJvmTypeReference
+            // InternalMenuDsl.g:5449:4: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:5450:5: lv_parameterType_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -14642,11 +14927,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5367:3: ( (lv_name_1_0= ruleValidID ) )
-            // InternalMenuDsl.g:5368:4: (lv_name_1_0= ruleValidID )
+            // InternalMenuDsl.g:5467:3: ( (lv_name_1_0= ruleValidID ) )
+            // InternalMenuDsl.g:5468:4: (lv_name_1_0= ruleValidID )
             {
-            // InternalMenuDsl.g:5368:4: (lv_name_1_0= ruleValidID )
-            // InternalMenuDsl.g:5369:5: lv_name_1_0= ruleValidID
+            // InternalMenuDsl.g:5468:4: (lv_name_1_0= ruleValidID )
+            // InternalMenuDsl.g:5469:5: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -14702,7 +14987,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // InternalMenuDsl.g:5390:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
+    // InternalMenuDsl.g:5490:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
     public final EObject entryRuleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -14710,8 +14995,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5390:53: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
-            // InternalMenuDsl.g:5391:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
+            // InternalMenuDsl.g:5490:53: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
+            // InternalMenuDsl.g:5491:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFeatureCallRule()); 
@@ -14742,7 +15027,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // InternalMenuDsl.g:5397: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 ) )? ) ;
+    // InternalMenuDsl.g:5497: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;
 
@@ -14769,14 +15054,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5403: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 ) )? ) )
-            // InternalMenuDsl.g:5404: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 ) )? )
+            // InternalMenuDsl.g:5503: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 ) )? ) )
+            // InternalMenuDsl.g:5504: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 ) )? )
             {
-            // InternalMenuDsl.g:5404: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 ) )? )
-            // InternalMenuDsl.g:5405: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 ) )?
+            // InternalMenuDsl.g:5504: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 ) )? )
+            // InternalMenuDsl.g:5505: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 ) )?
             {
-            // InternalMenuDsl.g:5405:3: ()
-            // InternalMenuDsl.g:5406:4: 
+            // InternalMenuDsl.g:5505:3: ()
+            // InternalMenuDsl.g:5506:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14788,35 +15073,35 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5412:3: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
-            int alt98=2;
-            int LA98_0 = input.LA(1);
+            // InternalMenuDsl.g:5512:3: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
+            int alt96=2;
+            int LA96_0 = input.LA(1);
 
-            if ( (LA98_0==51) ) {
-                alt98=1;
+            if ( (LA96_0==53) ) {
+                alt96=1;
             }
-            switch (alt98) {
+            switch (alt96) {
                 case 1 :
-                    // InternalMenuDsl.g:5413:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
+                    // InternalMenuDsl.g:5513:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
                     {
-                    otherlv_1=(Token)match(input,51,FOLLOW_52); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,53,FOLLOW_53); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_1, grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0());
                       			
                     }
-                    // InternalMenuDsl.g:5417:4: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // InternalMenuDsl.g:5418:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalMenuDsl.g:5517:4: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalMenuDsl.g:5518:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // InternalMenuDsl.g:5418:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
-                    // InternalMenuDsl.g:5419:6: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalMenuDsl.g:5518:5: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalMenuDsl.g:5519:6: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_53);
+                    pushFollow(FOLLOW_54);
                     lv_typeArguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -14840,39 +15125,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:5436:4: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop97:
+                    // InternalMenuDsl.g:5536:4: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop95:
                     do {
-                        int alt97=2;
-                        int LA97_0 = input.LA(1);
+                        int alt95=2;
+                        int LA95_0 = input.LA(1);
 
-                        if ( (LA97_0==40) ) {
-                            alt97=1;
+                        if ( (LA95_0==42) ) {
+                            alt95=1;
                         }
 
 
-                        switch (alt97) {
+                        switch (alt95) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:5437:5: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalMenuDsl.g:5537:5: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,40,FOLLOW_52); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,42,FOLLOW_53); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_3, grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0());
                     	      				
                     	    }
-                    	    // InternalMenuDsl.g:5441:5: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // InternalMenuDsl.g:5442:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalMenuDsl.g:5541:5: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalMenuDsl.g:5542:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // InternalMenuDsl.g:5442:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // InternalMenuDsl.g:5443:7: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalMenuDsl.g:5542:6: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalMenuDsl.g:5543:7: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_53);
+                    	    pushFollow(FOLLOW_54);
                     	    lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -14901,11 +15186,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop97;
+                    	    break loop95;
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,52,FOLLOW_51); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,54,FOLLOW_52); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_5, grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3());
@@ -14917,11 +15202,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5466:3: ( ( ruleIdOrSuper ) )
-            // InternalMenuDsl.g:5467:4: ( ruleIdOrSuper )
+            // InternalMenuDsl.g:5566:3: ( ( ruleIdOrSuper ) )
+            // InternalMenuDsl.g:5567:4: ( ruleIdOrSuper )
             {
-            // InternalMenuDsl.g:5467:4: ( ruleIdOrSuper )
-            // InternalMenuDsl.g:5468:5: ruleIdOrSuper
+            // InternalMenuDsl.g:5567:4: ( ruleIdOrSuper )
+            // InternalMenuDsl.g:5568:5: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
 
@@ -14951,20 +15236,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5482: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 alt101=2;
-            alt101 = dfa101.predict(input);
-            switch (alt101) {
+            // InternalMenuDsl.g:5582: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 alt99=2;
+            alt99 = dfa99.predict(input);
+            switch (alt99) {
                 case 1 :
-                    // InternalMenuDsl.g:5483: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= ')'
+                    // InternalMenuDsl.g:5583: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= ')'
                     {
-                    // InternalMenuDsl.g:5483:4: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
-                    // InternalMenuDsl.g:5484:5: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
+                    // InternalMenuDsl.g:5583:4: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
+                    // InternalMenuDsl.g:5584:5: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
                     {
-                    // InternalMenuDsl.g:5488:5: (lv_explicitOperationCall_7_0= '(' )
-                    // InternalMenuDsl.g:5489:6: lv_explicitOperationCall_7_0= '('
+                    // InternalMenuDsl.g:5588:5: (lv_explicitOperationCall_7_0= '(' )
+                    // InternalMenuDsl.g:5589:6: lv_explicitOperationCall_7_0= '('
                     {
-                    lv_explicitOperationCall_7_0=(Token)match(input,39,FOLLOW_55); if (state.failed) return current;
+                    lv_explicitOperationCall_7_0=(Token)match(input,41,FOLLOW_56); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_explicitOperationCall_7_0, grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0());
@@ -14984,25 +15269,25 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:5501:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
-                    int alt100=3;
-                    alt100 = dfa100.predict(input);
-                    switch (alt100) {
+                    // InternalMenuDsl.g:5601:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
+                    int alt98=3;
+                    alt98 = dfa98.predict(input);
+                    switch (alt98) {
                         case 1 :
-                            // InternalMenuDsl.g:5502:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalMenuDsl.g:5602:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
                             {
-                            // InternalMenuDsl.g:5502:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
-                            // InternalMenuDsl.g:5503:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalMenuDsl.g:5602:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalMenuDsl.g:5603:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
                             {
-                            // InternalMenuDsl.g:5528:6: (lv_featureCallArguments_8_0= ruleXShortClosure )
-                            // InternalMenuDsl.g:5529:7: lv_featureCallArguments_8_0= ruleXShortClosure
+                            // InternalMenuDsl.g:5628:6: (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalMenuDsl.g:5629:7: lv_featureCallArguments_8_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_25);
+                            pushFollow(FOLLOW_26);
                             lv_featureCallArguments_8_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -15030,23 +15315,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:5547:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalMenuDsl.g:5647:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
                             {
-                            // InternalMenuDsl.g:5547:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
-                            // InternalMenuDsl.g:5548:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalMenuDsl.g:5647:5: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalMenuDsl.g:5648:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             {
-                            // InternalMenuDsl.g:5548:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
-                            // InternalMenuDsl.g:5549:7: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalMenuDsl.g:5648:6: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
+                            // InternalMenuDsl.g:5649:7: (lv_featureCallArguments_9_0= ruleXExpression )
                             {
-                            // InternalMenuDsl.g:5549:7: (lv_featureCallArguments_9_0= ruleXExpression )
-                            // InternalMenuDsl.g:5550:8: lv_featureCallArguments_9_0= ruleXExpression
+                            // InternalMenuDsl.g:5649:7: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalMenuDsl.g:5650:8: lv_featureCallArguments_9_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0());
                               							
                             }
-                            pushFollow(FOLLOW_24);
+                            pushFollow(FOLLOW_25);
                             lv_featureCallArguments_9_0=ruleXExpression();
 
                             state._fsp--;
@@ -15070,39 +15355,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:5567:6: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
-                            loop99:
+                            // InternalMenuDsl.g:5667:6: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            loop97:
                             do {
-                                int alt99=2;
-                                int LA99_0 = input.LA(1);
+                                int alt97=2;
+                                int LA97_0 = input.LA(1);
 
-                                if ( (LA99_0==40) ) {
-                                    alt99=1;
+                                if ( (LA97_0==42) ) {
+                                    alt97=1;
                                 }
 
 
-                                switch (alt99) {
+                                switch (alt97) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:5568:7: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalMenuDsl.g:5668:7: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_10=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                            	    otherlv_10=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_10, grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0());
                             	      						
                             	    }
-                            	    // InternalMenuDsl.g:5572:7: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
-                            	    // InternalMenuDsl.g:5573:8: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalMenuDsl.g:5672:7: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalMenuDsl.g:5673:8: (lv_featureCallArguments_11_0= ruleXExpression )
                             	    {
-                            	    // InternalMenuDsl.g:5573:8: (lv_featureCallArguments_11_0= ruleXExpression )
-                            	    // InternalMenuDsl.g:5574:9: lv_featureCallArguments_11_0= ruleXExpression
+                            	    // InternalMenuDsl.g:5673:8: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalMenuDsl.g:5674:9: lv_featureCallArguments_11_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      									newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0());
                             	      								
                             	    }
-                            	    pushFollow(FOLLOW_24);
+                            	    pushFollow(FOLLOW_25);
                             	    lv_featureCallArguments_11_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -15131,7 +15416,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop99;
+                            	    break loop97;
                                 }
                             } while (true);
 
@@ -15144,7 +15429,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_12=(Token)match(input,41,FOLLOW_84); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,43,FOLLOW_84); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_12, grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2());
@@ -15156,15 +15441,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5599:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
-            int alt102=2;
-            alt102 = dfa102.predict(input);
-            switch (alt102) {
+            // InternalMenuDsl.g:5699:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            int alt100=2;
+            alt100 = dfa100.predict(input);
+            switch (alt100) {
                 case 1 :
-                    // InternalMenuDsl.g:5600:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalMenuDsl.g:5700:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
                     {
-                    // InternalMenuDsl.g:5606:4: (lv_featureCallArguments_13_0= ruleXClosure )
-                    // InternalMenuDsl.g:5607:5: lv_featureCallArguments_13_0= ruleXClosure
+                    // InternalMenuDsl.g:5706:4: (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalMenuDsl.g:5707:5: lv_featureCallArguments_13_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15223,7 +15508,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // InternalMenuDsl.g:5628:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
+    // InternalMenuDsl.g:5728:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
     public final String entryRuleFeatureCallID() throws RecognitionException {
         String current = null;
 
@@ -15231,8 +15516,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5628:53: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
-            // InternalMenuDsl.g:5629:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
+            // InternalMenuDsl.g:5728:53: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
+            // InternalMenuDsl.g:5729:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallIDRule()); 
@@ -15263,7 +15548,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // InternalMenuDsl.g:5635:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) ;
+    // InternalMenuDsl.g:5735: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();
 
@@ -15275,48 +15560,48 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5641:2: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
-            // InternalMenuDsl.g:5642:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            // InternalMenuDsl.g:5741:2: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
+            // InternalMenuDsl.g:5742:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
             {
-            // InternalMenuDsl.g:5642:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
-            int alt103=5;
+            // InternalMenuDsl.g:5742:2: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            int alt101=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                alt103=1;
+                alt101=1;
                 }
                 break;
-            case 91:
+            case 93:
                 {
-                alt103=2;
+                alt101=2;
                 }
                 break;
-            case 33:
+            case 35:
                 {
-                alt103=3;
+                alt101=3;
                 }
                 break;
-            case 32:
+            case 34:
                 {
-                alt103=4;
+                alt101=4;
                 }
                 break;
-            case 34:
+            case 36:
                 {
-                alt103=5;
+                alt101=5;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 103, 0, input);
+                    new NoViableAltException("", 101, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt103) {
+            switch (alt101) {
                 case 1 :
-                    // InternalMenuDsl.g:5643:3: this_ValidID_0= ruleValidID
+                    // InternalMenuDsl.g:5743:3: this_ValidID_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15342,9 +15627,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:5654:3: kw= 'extends'
+                    // InternalMenuDsl.g:5754:3: kw= 'extends'
                     {
-                    kw=(Token)match(input,91,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);
@@ -15355,9 +15640,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalMenuDsl.g:5660:3: kw= 'static'
+                    // InternalMenuDsl.g:5760:3: kw= 'static'
                     {
-                    kw=(Token)match(input,33,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,35,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -15368,9 +15653,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalMenuDsl.g:5666:3: kw= 'import'
+                    // InternalMenuDsl.g:5766:3: kw= 'import'
                     {
-                    kw=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -15381,9 +15666,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalMenuDsl.g:5672:3: kw= 'extension'
+                    // InternalMenuDsl.g:5772:3: kw= 'extension'
                     {
-                    kw=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
+                    kw=(Token)match(input,36,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			current.merge(kw);
@@ -15418,7 +15703,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // InternalMenuDsl.g:5681:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
+    // InternalMenuDsl.g:5781:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
     public final String entryRuleIdOrSuper() throws RecognitionException {
         String current = null;
 
@@ -15426,8 +15711,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5681:49: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
-            // InternalMenuDsl.g:5682:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
+            // InternalMenuDsl.g:5781:49: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
+            // InternalMenuDsl.g:5782:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdOrSuperRule()); 
@@ -15458,7 +15743,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // InternalMenuDsl.g:5688:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
+    // InternalMenuDsl.g:5788:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
     public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -15470,29 +15755,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5694:2: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
-            // InternalMenuDsl.g:5695:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalMenuDsl.g:5794:2: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
+            // InternalMenuDsl.g:5795:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             {
-            // InternalMenuDsl.g:5695:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
-            int alt104=2;
-            int LA104_0 = input.LA(1);
+            // InternalMenuDsl.g:5795:2: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            int alt102=2;
+            int LA102_0 = input.LA(1);
 
-            if ( (LA104_0==RULE_ID||(LA104_0>=32 && LA104_0<=34)||LA104_0==91) ) {
-                alt104=1;
+            if ( (LA102_0==RULE_ID||(LA102_0>=34 && LA102_0<=36)||LA102_0==93) ) {
+                alt102=1;
             }
-            else if ( (LA104_0==92) ) {
-                alt104=2;
+            else if ( (LA102_0==94) ) {
+                alt102=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 104, 0, input);
+                    new NoViableAltException("", 102, 0, input);
 
                 throw nvae;
             }
-            switch (alt104) {
+            switch (alt102) {
                 case 1 :
-                    // InternalMenuDsl.g:5696:3: this_FeatureCallID_0= ruleFeatureCallID
+                    // InternalMenuDsl.g:5796:3: this_FeatureCallID_0= ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -15518,9 +15803,9 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:5707:3: kw= 'super'
+                    // InternalMenuDsl.g:5807:3: kw= 'super'
                     {
-                    kw=(Token)match(input,92,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);
@@ -15555,7 +15840,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // InternalMenuDsl.g:5716:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
+    // InternalMenuDsl.g:5816:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
     public final EObject entryRuleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -15563,8 +15848,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5716:57: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
-            // InternalMenuDsl.g:5717:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
+            // InternalMenuDsl.g:5816:57: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
+            // InternalMenuDsl.g:5817:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstructorCallRule()); 
@@ -15595,7 +15880,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // InternalMenuDsl.g:5723: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 ) )? ) ;
+    // InternalMenuDsl.g:5823: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;
 
@@ -15623,14 +15908,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5729: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 ) )? ) )
-            // InternalMenuDsl.g:5730: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 ) )? )
+            // InternalMenuDsl.g:5829: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 ) )? ) )
+            // InternalMenuDsl.g:5830: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 ) )? )
             {
-            // InternalMenuDsl.g:5730: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 ) )? )
-            // InternalMenuDsl.g:5731: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 ) )?
+            // InternalMenuDsl.g:5830: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 ) )? )
+            // InternalMenuDsl.g:5831: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 ) )?
             {
-            // InternalMenuDsl.g:5731:3: ()
-            // InternalMenuDsl.g:5732:4: 
+            // InternalMenuDsl.g:5831:3: ()
+            // InternalMenuDsl.g:5832:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15642,17 +15927,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,93,FOLLOW_4); if (state.failed) return current;
+            otherlv_1=(Token)match(input,95,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXConstructorCallAccess().getNewKeyword_1());
               		
             }
-            // InternalMenuDsl.g:5742:3: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:5743:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:5842:3: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:5843:4: ( ruleQualifiedName )
             {
-            // InternalMenuDsl.g:5743:4: ( ruleQualifiedName )
-            // InternalMenuDsl.g:5744:5: ruleQualifiedName
+            // InternalMenuDsl.g:5843:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:5844:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -15682,17 +15967,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5758:3: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
-            int alt106=2;
-            alt106 = dfa106.predict(input);
-            switch (alt106) {
+            // InternalMenuDsl.g:5858:3: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
+            int alt104=2;
+            alt104 = dfa104.predict(input);
+            switch (alt104) {
                 case 1 :
-                    // InternalMenuDsl.g:5759:4: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
+                    // InternalMenuDsl.g:5859:4: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
                     {
-                    // InternalMenuDsl.g:5759:4: ( ( '<' )=>otherlv_3= '<' )
-                    // InternalMenuDsl.g:5760:5: ( '<' )=>otherlv_3= '<'
+                    // InternalMenuDsl.g:5859:4: ( ( '<' )=>otherlv_3= '<' )
+                    // InternalMenuDsl.g:5860:5: ( '<' )=>otherlv_3= '<'
                     {
-                    otherlv_3=(Token)match(input,51,FOLLOW_52); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,53,FOLLOW_53); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_3, grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0());
@@ -15701,18 +15986,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:5766:4: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    // InternalMenuDsl.g:5767:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalMenuDsl.g:5866:4: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    // InternalMenuDsl.g:5867:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     {
-                    // InternalMenuDsl.g:5767:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    // InternalMenuDsl.g:5768:6: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    // InternalMenuDsl.g:5867:5: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalMenuDsl.g:5868:6: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_53);
+                    pushFollow(FOLLOW_54);
                     lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -15736,39 +16021,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:5785:4: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop105:
+                    // InternalMenuDsl.g:5885:4: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop103:
                     do {
-                        int alt105=2;
-                        int LA105_0 = input.LA(1);
+                        int alt103=2;
+                        int LA103_0 = input.LA(1);
 
-                        if ( (LA105_0==40) ) {
-                            alt105=1;
+                        if ( (LA103_0==42) ) {
+                            alt103=1;
                         }
 
 
-                        switch (alt105) {
+                        switch (alt103) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:5786:5: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalMenuDsl.g:5886:5: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,40,FOLLOW_52); if (state.failed) return current;
+                    	    otherlv_5=(Token)match(input,42,FOLLOW_53); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_5, grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0());
                     	      				
                     	    }
-                    	    // InternalMenuDsl.g:5790:5: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
-                    	    // InternalMenuDsl.g:5791:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalMenuDsl.g:5890:5: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalMenuDsl.g:5891:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // InternalMenuDsl.g:5791:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
-                    	    // InternalMenuDsl.g:5792:7: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
+                    	    // InternalMenuDsl.g:5891:6: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalMenuDsl.g:5892:7: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_53);
+                    	    pushFollow(FOLLOW_54);
                     	    lv_typeArguments_6_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -15797,11 +16082,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop105;
+                    	    break loop103;
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,52,FOLLOW_83); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,54,FOLLOW_83); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_7, grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3());
@@ -15813,20 +16098,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5815: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 alt109=2;
-            alt109 = dfa109.predict(input);
-            switch (alt109) {
+            // InternalMenuDsl.g:5915: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 alt107=2;
+            alt107 = dfa107.predict(input);
+            switch (alt107) {
                 case 1 :
-                    // InternalMenuDsl.g:5816: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= ')'
+                    // InternalMenuDsl.g:5916: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= ')'
                     {
-                    // InternalMenuDsl.g:5816:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
-                    // InternalMenuDsl.g:5817:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalMenuDsl.g:5916:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
+                    // InternalMenuDsl.g:5917:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
                     {
-                    // InternalMenuDsl.g:5821:5: (lv_explicitConstructorCall_8_0= '(' )
-                    // InternalMenuDsl.g:5822:6: lv_explicitConstructorCall_8_0= '('
+                    // InternalMenuDsl.g:5921:5: (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalMenuDsl.g:5922:6: lv_explicitConstructorCall_8_0= '('
                     {
-                    lv_explicitConstructorCall_8_0=(Token)match(input,39,FOLLOW_55); if (state.failed) return current;
+                    lv_explicitConstructorCall_8_0=(Token)match(input,41,FOLLOW_56); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_explicitConstructorCall_8_0, grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0());
@@ -15846,25 +16131,25 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:5834:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
-                    int alt108=3;
-                    alt108 = dfa108.predict(input);
-                    switch (alt108) {
+                    // InternalMenuDsl.g:5934:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
+                    int alt106=3;
+                    alt106 = dfa106.predict(input);
+                    switch (alt106) {
                         case 1 :
-                            // InternalMenuDsl.g:5835:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalMenuDsl.g:5935:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
                             {
-                            // InternalMenuDsl.g:5835:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
-                            // InternalMenuDsl.g:5836:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalMenuDsl.g:5935:5: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalMenuDsl.g:5936:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
                             {
-                            // InternalMenuDsl.g:5861:6: (lv_arguments_9_0= ruleXShortClosure )
-                            // InternalMenuDsl.g:5862:7: lv_arguments_9_0= ruleXShortClosure
+                            // InternalMenuDsl.g:5961:6: (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalMenuDsl.g:5962:7: lv_arguments_9_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_25);
+                            pushFollow(FOLLOW_26);
                             lv_arguments_9_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -15892,23 +16177,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:5880:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalMenuDsl.g:5980:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
                             {
-                            // InternalMenuDsl.g:5880:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
-                            // InternalMenuDsl.g:5881:6: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalMenuDsl.g:5980:5: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalMenuDsl.g:5981:6: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             {
-                            // InternalMenuDsl.g:5881:6: ( (lv_arguments_10_0= ruleXExpression ) )
-                            // InternalMenuDsl.g:5882:7: (lv_arguments_10_0= ruleXExpression )
+                            // InternalMenuDsl.g:5981:6: ( (lv_arguments_10_0= ruleXExpression ) )
+                            // InternalMenuDsl.g:5982:7: (lv_arguments_10_0= ruleXExpression )
                             {
-                            // InternalMenuDsl.g:5882:7: (lv_arguments_10_0= ruleXExpression )
-                            // InternalMenuDsl.g:5883:8: lv_arguments_10_0= ruleXExpression
+                            // InternalMenuDsl.g:5982:7: (lv_arguments_10_0= ruleXExpression )
+                            // InternalMenuDsl.g:5983:8: lv_arguments_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
 
                               								newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0());
                               							
                             }
-                            pushFollow(FOLLOW_24);
+                            pushFollow(FOLLOW_25);
                             lv_arguments_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -15932,39 +16217,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:5900:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
-                            loop107:
+                            // InternalMenuDsl.g:6000:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            loop105:
                             do {
-                                int alt107=2;
-                                int LA107_0 = input.LA(1);
+                                int alt105=2;
+                                int LA105_0 = input.LA(1);
 
-                                if ( (LA107_0==40) ) {
-                                    alt107=1;
+                                if ( (LA105_0==42) ) {
+                                    alt105=1;
                                 }
 
 
-                                switch (alt107) {
+                                switch (alt105) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:5901:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalMenuDsl.g:6001:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_11=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
+                            	    otherlv_11=(Token)match(input,42,FOLLOW_28); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      							newLeafNode(otherlv_11, grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0());
                             	      						
                             	    }
-                            	    // InternalMenuDsl.g:5905:7: ( (lv_arguments_12_0= ruleXExpression ) )
-                            	    // InternalMenuDsl.g:5906:8: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalMenuDsl.g:6005:7: ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalMenuDsl.g:6006:8: (lv_arguments_12_0= ruleXExpression )
                             	    {
-                            	    // InternalMenuDsl.g:5906:8: (lv_arguments_12_0= ruleXExpression )
-                            	    // InternalMenuDsl.g:5907:9: lv_arguments_12_0= ruleXExpression
+                            	    // InternalMenuDsl.g:6006:8: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalMenuDsl.g:6007:9: lv_arguments_12_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      									newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0());
                             	      								
                             	    }
-                            	    pushFollow(FOLLOW_24);
+                            	    pushFollow(FOLLOW_25);
                             	    lv_arguments_12_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -15993,7 +16278,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop107;
+                            	    break loop105;
                                 }
                             } while (true);
 
@@ -16006,7 +16291,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_13=(Token)match(input,41,FOLLOW_84); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,43,FOLLOW_84); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_13, grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2());
@@ -16018,15 +16303,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5932:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
-            int alt110=2;
-            alt110 = dfa110.predict(input);
-            switch (alt110) {
+            // InternalMenuDsl.g:6032:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            int alt108=2;
+            alt108 = dfa108.predict(input);
+            switch (alt108) {
                 case 1 :
-                    // InternalMenuDsl.g:5933:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
+                    // InternalMenuDsl.g:6033:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
                     {
-                    // InternalMenuDsl.g:5939:4: (lv_arguments_14_0= ruleXClosure )
-                    // InternalMenuDsl.g:5940:5: lv_arguments_14_0= ruleXClosure
+                    // InternalMenuDsl.g:6039:4: (lv_arguments_14_0= ruleXClosure )
+                    // InternalMenuDsl.g:6040:5: lv_arguments_14_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
 
@@ -16085,7 +16370,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // InternalMenuDsl.g:5961:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
+    // InternalMenuDsl.g:6061:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
     public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16093,8 +16378,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:5961:56: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
-            // InternalMenuDsl.g:5962:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
+            // InternalMenuDsl.g:6061:56: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
+            // InternalMenuDsl.g:6062:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBooleanLiteralRule()); 
@@ -16125,7 +16410,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // InternalMenuDsl.g:5968:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalMenuDsl.g:6068:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16136,14 +16421,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:5974:2: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // InternalMenuDsl.g:5975:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalMenuDsl.g:6074:2: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalMenuDsl.g:6075:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // InternalMenuDsl.g:5975:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // InternalMenuDsl.g:5976:3: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalMenuDsl.g:6075:2: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalMenuDsl.g:6076:3: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // InternalMenuDsl.g:5976:3: ()
-            // InternalMenuDsl.g:5977:4: 
+            // InternalMenuDsl.g:6076:3: ()
+            // InternalMenuDsl.g:6077:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16155,28 +16440,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:5983:3: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
-            int alt111=2;
-            int LA111_0 = input.LA(1);
+            // InternalMenuDsl.g:6083:3: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            int alt109=2;
+            int LA109_0 = input.LA(1);
 
-            if ( (LA111_0==94) ) {
-                alt111=1;
+            if ( (LA109_0==96) ) {
+                alt109=1;
             }
-            else if ( (LA111_0==95) ) {
-                alt111=2;
+            else if ( (LA109_0==97) ) {
+                alt109=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 111, 0, input);
+                    new NoViableAltException("", 109, 0, input);
 
                 throw nvae;
             }
-            switch (alt111) {
+            switch (alt109) {
                 case 1 :
-                    // InternalMenuDsl.g:5984:4: otherlv_1= 'false'
+                    // InternalMenuDsl.g:6084:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,94,FOLLOW_2); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,96,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_1, grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0());
@@ -16186,15 +16471,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:5989:4: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalMenuDsl.g:6089:4: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // InternalMenuDsl.g:5989:4: ( (lv_isTrue_2_0= 'true' ) )
-                    // InternalMenuDsl.g:5990:5: (lv_isTrue_2_0= 'true' )
+                    // InternalMenuDsl.g:6089:4: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalMenuDsl.g:6090:5: (lv_isTrue_2_0= 'true' )
                     {
-                    // InternalMenuDsl.g:5990:5: (lv_isTrue_2_0= 'true' )
-                    // InternalMenuDsl.g:5991:6: lv_isTrue_2_0= 'true'
+                    // InternalMenuDsl.g:6090:5: (lv_isTrue_2_0= 'true' )
+                    // InternalMenuDsl.g:6091:6: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,95,FOLLOW_2); if (state.failed) return current;
+                    lv_isTrue_2_0=(Token)match(input,97,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       						newLeafNode(lv_isTrue_2_0, grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
@@ -16245,7 +16530,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // InternalMenuDsl.g:6008:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
+    // InternalMenuDsl.g:6108:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
     public final EObject entryRuleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16253,8 +16538,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6008:53: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
-            // InternalMenuDsl.g:6009:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
+            // InternalMenuDsl.g:6108:53: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
+            // InternalMenuDsl.g:6109:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNullLiteralRule()); 
@@ -16285,7 +16570,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // InternalMenuDsl.g:6015:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
+    // InternalMenuDsl.g:6115:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
     public final EObject ruleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16295,14 +16580,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6021:2: ( ( () otherlv_1= 'null' ) )
-            // InternalMenuDsl.g:6022:2: ( () otherlv_1= 'null' )
+            // InternalMenuDsl.g:6121:2: ( ( () otherlv_1= 'null' ) )
+            // InternalMenuDsl.g:6122:2: ( () otherlv_1= 'null' )
             {
-            // InternalMenuDsl.g:6022:2: ( () otherlv_1= 'null' )
-            // InternalMenuDsl.g:6023:3: () otherlv_1= 'null'
+            // InternalMenuDsl.g:6122:2: ( () otherlv_1= 'null' )
+            // InternalMenuDsl.g:6123:3: () otherlv_1= 'null'
             {
-            // InternalMenuDsl.g:6023:3: ()
-            // InternalMenuDsl.g:6024:4: 
+            // InternalMenuDsl.g:6123:3: ()
+            // InternalMenuDsl.g:6124:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16314,7 +16599,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,96,FOLLOW_2); if (state.failed) return current;
+            otherlv_1=(Token)match(input,98,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXNullLiteralAccess().getNullKeyword_1());
@@ -16345,7 +16630,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // InternalMenuDsl.g:6038:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
+    // InternalMenuDsl.g:6138:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
     public final EObject entryRuleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16353,8 +16638,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6038:55: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
-            // InternalMenuDsl.g:6039:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
+            // InternalMenuDsl.g:6138:55: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
+            // InternalMenuDsl.g:6139:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNumberLiteralRule()); 
@@ -16385,7 +16670,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // InternalMenuDsl.g:6045:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
+    // InternalMenuDsl.g:6145:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
     public final EObject ruleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16396,14 +16681,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6051:2: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
-            // InternalMenuDsl.g:6052:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalMenuDsl.g:6151:2: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
+            // InternalMenuDsl.g:6152:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
             {
-            // InternalMenuDsl.g:6052:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
-            // InternalMenuDsl.g:6053:3: () ( (lv_value_1_0= ruleNumber ) )
+            // InternalMenuDsl.g:6152:2: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalMenuDsl.g:6153:3: () ( (lv_value_1_0= ruleNumber ) )
             {
-            // InternalMenuDsl.g:6053:3: ()
-            // InternalMenuDsl.g:6054:4: 
+            // InternalMenuDsl.g:6153:3: ()
+            // InternalMenuDsl.g:6154:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16415,11 +16700,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:6060:3: ( (lv_value_1_0= ruleNumber ) )
-            // InternalMenuDsl.g:6061:4: (lv_value_1_0= ruleNumber )
+            // InternalMenuDsl.g:6160:3: ( (lv_value_1_0= ruleNumber ) )
+            // InternalMenuDsl.g:6161:4: (lv_value_1_0= ruleNumber )
             {
-            // InternalMenuDsl.g:6061:4: (lv_value_1_0= ruleNumber )
-            // InternalMenuDsl.g:6062:5: lv_value_1_0= ruleNumber
+            // InternalMenuDsl.g:6161:4: (lv_value_1_0= ruleNumber )
+            // InternalMenuDsl.g:6162:5: lv_value_1_0= ruleNumber
             {
             if ( state.backtracking==0 ) {
 
@@ -16475,7 +16760,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // InternalMenuDsl.g:6083:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
+    // InternalMenuDsl.g:6183:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
     public final EObject entryRuleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16483,8 +16768,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6083:55: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
-            // InternalMenuDsl.g:6084:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
+            // InternalMenuDsl.g:6183:55: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
+            // InternalMenuDsl.g:6184:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXStringLiteralRule()); 
@@ -16515,7 +16800,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // InternalMenuDsl.g:6090:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalMenuDsl.g:6190:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16525,14 +16810,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6096:2: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // InternalMenuDsl.g:6097:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalMenuDsl.g:6196:2: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalMenuDsl.g:6197:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // InternalMenuDsl.g:6097:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // InternalMenuDsl.g:6098:3: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalMenuDsl.g:6197:2: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalMenuDsl.g:6198:3: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // InternalMenuDsl.g:6098:3: ()
-            // InternalMenuDsl.g:6099:4: 
+            // InternalMenuDsl.g:6198:3: ()
+            // InternalMenuDsl.g:6199:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16544,11 +16829,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:6105:3: ( (lv_value_1_0= RULE_STRING ) )
-            // InternalMenuDsl.g:6106:4: (lv_value_1_0= RULE_STRING )
+            // InternalMenuDsl.g:6205:3: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalMenuDsl.g:6206:4: (lv_value_1_0= RULE_STRING )
             {
-            // InternalMenuDsl.g:6106:4: (lv_value_1_0= RULE_STRING )
-            // InternalMenuDsl.g:6107:5: lv_value_1_0= RULE_STRING
+            // InternalMenuDsl.g:6206:4: (lv_value_1_0= RULE_STRING )
+            // InternalMenuDsl.g:6207: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 ) {
@@ -16599,7 +16884,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // InternalMenuDsl.g:6127:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
+    // InternalMenuDsl.g:6227:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
     public final EObject entryRuleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -16607,8 +16892,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6127:53: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
-            // InternalMenuDsl.g:6128:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
+            // InternalMenuDsl.g:6227:53: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
+            // InternalMenuDsl.g:6228:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTypeLiteralRule()); 
@@ -16639,7 +16924,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // InternalMenuDsl.g:6134:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
+    // InternalMenuDsl.g:6234: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;
 
@@ -16653,14 +16938,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6140:2: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
-            // InternalMenuDsl.g:6141:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalMenuDsl.g:6240:2: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
+            // InternalMenuDsl.g:6241:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
             {
-            // InternalMenuDsl.g:6141:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
-            // InternalMenuDsl.g:6142:3: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
+            // InternalMenuDsl.g:6241:2: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalMenuDsl.g:6242:3: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
             {
-            // InternalMenuDsl.g:6142:3: ()
-            // InternalMenuDsl.g:6143:4: 
+            // InternalMenuDsl.g:6242:3: ()
+            // InternalMenuDsl.g:6243:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16672,23 +16957,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,97,FOLLOW_66); if (state.failed) return current;
+            otherlv_1=(Token)match(input,99,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1());
               		
             }
-            otherlv_2=(Token)match(input,39,FOLLOW_4); if (state.failed) return current;
+            otherlv_2=(Token)match(input,41,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_2, grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2());
               		
             }
-            // InternalMenuDsl.g:6157:3: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:6158:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:6257:3: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:6258:4: ( ruleQualifiedName )
             {
-            // InternalMenuDsl.g:6158:4: ( ruleQualifiedName )
-            // InternalMenuDsl.g:6159:5: ruleQualifiedName
+            // InternalMenuDsl.g:6258:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:6259:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -16718,23 +17003,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:6173:3: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
-            loop112:
+            // InternalMenuDsl.g:6273:3: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
+            loop110:
             do {
-                int alt112=2;
-                int LA112_0 = input.LA(1);
+                int alt110=2;
+                int LA110_0 = input.LA(1);
 
-                if ( (LA112_0==44) ) {
-                    alt112=1;
+                if ( (LA110_0==46) ) {
+                    alt110=1;
                 }
 
 
-                switch (alt112) {
+                switch (alt110) {
             	case 1 :
-            	    // InternalMenuDsl.g:6174:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalMenuDsl.g:6274:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
             	    {
-            	    // InternalMenuDsl.g:6174:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
-            	    // InternalMenuDsl.g:6175:5: lv_arrayDimensions_4_0= ruleArrayBrackets
+            	    // InternalMenuDsl.g:6274:4: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalMenuDsl.g:6275:5: lv_arrayDimensions_4_0= ruleArrayBrackets
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -16767,11 +17052,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop112;
+            	    break loop110;
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,41,FOLLOW_2); if (state.failed) return current;
+            otherlv_5=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_5, grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5());
@@ -16802,7 +17087,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // InternalMenuDsl.g:6200:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
+    // InternalMenuDsl.g:6300:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
     public final EObject entryRuleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16810,8 +17095,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6200:57: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
-            // InternalMenuDsl.g:6201:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
+            // InternalMenuDsl.g:6300:57: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
+            // InternalMenuDsl.g:6301:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXThrowExpressionRule()); 
@@ -16842,7 +17127,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // InternalMenuDsl.g:6207:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
+    // InternalMenuDsl.g:6307:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16854,14 +17139,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6213:2: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
-            // InternalMenuDsl.g:6214:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:6313:2: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
+            // InternalMenuDsl.g:6314:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
             {
-            // InternalMenuDsl.g:6214:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
-            // InternalMenuDsl.g:6215:3: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6314:2: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:6315:3: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
             {
-            // InternalMenuDsl.g:6215:3: ()
-            // InternalMenuDsl.g:6216:4: 
+            // InternalMenuDsl.g:6315:3: ()
+            // InternalMenuDsl.g:6316:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16873,17 +17158,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,98,FOLLOW_27); if (state.failed) return current;
+            otherlv_1=(Token)match(input,100,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1());
               		
             }
-            // InternalMenuDsl.g:6226:3: ( (lv_expression_2_0= ruleXExpression ) )
-            // InternalMenuDsl.g:6227:4: (lv_expression_2_0= ruleXExpression )
+            // InternalMenuDsl.g:6326:3: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6327:4: (lv_expression_2_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:6227:4: (lv_expression_2_0= ruleXExpression )
-            // InternalMenuDsl.g:6228:5: lv_expression_2_0= ruleXExpression
+            // InternalMenuDsl.g:6327:4: (lv_expression_2_0= ruleXExpression )
+            // InternalMenuDsl.g:6328:5: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -16939,7 +17224,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // InternalMenuDsl.g:6249:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
+    // InternalMenuDsl.g:6349:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
     public final EObject entryRuleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16947,8 +17232,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6249:58: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
-            // InternalMenuDsl.g:6250:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
+            // InternalMenuDsl.g:6349:58: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
+            // InternalMenuDsl.g:6350:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXReturnExpressionRule()); 
@@ -16979,7 +17264,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // InternalMenuDsl.g:6256: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 ) )? ) ;
+    // InternalMenuDsl.g:6356: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;
 
@@ -16991,14 +17276,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6262: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 ) )? ) )
-            // InternalMenuDsl.g:6263: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 ) )? )
+            // InternalMenuDsl.g:6362: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 ) )? ) )
+            // InternalMenuDsl.g:6363: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 ) )? )
             {
-            // InternalMenuDsl.g:6263: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 ) )? )
-            // InternalMenuDsl.g:6264: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 ) )?
+            // InternalMenuDsl.g:6363: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 ) )? )
+            // InternalMenuDsl.g:6364: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 ) )?
             {
-            // InternalMenuDsl.g:6264:3: ()
-            // InternalMenuDsl.g:6265:4: 
+            // InternalMenuDsl.g:6364:3: ()
+            // InternalMenuDsl.g:6365:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17010,21 +17295,21 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,99,FOLLOW_87); if (state.failed) return current;
+            otherlv_1=(Token)match(input,101,FOLLOW_87); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1());
               		
             }
-            // InternalMenuDsl.g:6275: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 alt113=2;
-            alt113 = dfa113.predict(input);
-            switch (alt113) {
+            // InternalMenuDsl.g:6375: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 alt111=2;
+            alt111 = dfa111.predict(input);
+            switch (alt111) {
                 case 1 :
-                    // InternalMenuDsl.g:6276: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 )
+                    // InternalMenuDsl.g:6376: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 )
                     {
-                    // InternalMenuDsl.g:6277:4: (lv_expression_2_0= ruleXExpression )
-                    // InternalMenuDsl.g:6278:5: lv_expression_2_0= ruleXExpression
+                    // InternalMenuDsl.g:6377:4: (lv_expression_2_0= ruleXExpression )
+                    // InternalMenuDsl.g:6378:5: lv_expression_2_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -17083,7 +17368,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // InternalMenuDsl.g:6299:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
+    // InternalMenuDsl.g:6399:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
     public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17091,8 +17376,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6299:67: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
-            // InternalMenuDsl.g:6300:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
+            // InternalMenuDsl.g:6399:67: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
+            // InternalMenuDsl.g:6400:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionRule()); 
@@ -17123,7 +17408,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // InternalMenuDsl.g:6306: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 ) ) ) ) ) ;
+    // InternalMenuDsl.g:6406: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;
 
@@ -17143,14 +17428,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6312: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 ) ) ) ) ) )
-            // InternalMenuDsl.g:6313: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 ) ) ) ) )
+            // InternalMenuDsl.g:6412: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 ) ) ) ) ) )
+            // InternalMenuDsl.g:6413: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 ) ) ) ) )
             {
-            // InternalMenuDsl.g:6313: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 ) ) ) ) )
-            // InternalMenuDsl.g:6314: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 ) ) ) )
+            // InternalMenuDsl.g:6413: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 ) ) ) ) )
+            // InternalMenuDsl.g:6414: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 ) ) ) )
             {
-            // InternalMenuDsl.g:6314:3: ()
-            // InternalMenuDsl.g:6315:4: 
+            // InternalMenuDsl.g:6414:3: ()
+            // InternalMenuDsl.g:6415:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17162,17 +17447,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,100,FOLLOW_27); if (state.failed) return current;
+            otherlv_1=(Token)match(input,102,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1());
               		
             }
-            // InternalMenuDsl.g:6325:3: ( (lv_expression_2_0= ruleXExpression ) )
-            // InternalMenuDsl.g:6326:4: (lv_expression_2_0= ruleXExpression )
+            // InternalMenuDsl.g:6425:3: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6426:4: (lv_expression_2_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:6326:4: (lv_expression_2_0= ruleXExpression )
-            // InternalMenuDsl.g:6327:5: lv_expression_2_0= ruleXExpression
+            // InternalMenuDsl.g:6426:4: (lv_expression_2_0= ruleXExpression )
+            // InternalMenuDsl.g:6427:5: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -17203,54 +17488,54 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:6344: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 alt116=2;
-            int LA116_0 = input.LA(1);
+            // InternalMenuDsl.g:6444: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 alt114=2;
+            int LA114_0 = input.LA(1);
 
-            if ( (LA116_0==103) ) {
-                alt116=1;
+            if ( (LA114_0==105) ) {
+                alt114=1;
             }
-            else if ( (LA116_0==101) ) {
-                alt116=2;
+            else if ( (LA114_0==103) ) {
+                alt114=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 116, 0, input);
+                    new NoViableAltException("", 114, 0, input);
 
                 throw nvae;
             }
-            switch (alt116) {
+            switch (alt114) {
                 case 1 :
-                    // InternalMenuDsl.g:6345:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalMenuDsl.g:6445:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
                     {
-                    // InternalMenuDsl.g:6345:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
-                    // InternalMenuDsl.g:6346:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalMenuDsl.g:6445:4: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalMenuDsl.g:6446:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     {
-                    // InternalMenuDsl.g:6346:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
-                    int cnt114=0;
-                    loop114:
+                    // InternalMenuDsl.g:6446:5: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
+                    int cnt112=0;
+                    loop112:
                     do {
-                        int alt114=2;
-                        int LA114_0 = input.LA(1);
+                        int alt112=2;
+                        int LA112_0 = input.LA(1);
 
-                        if ( (LA114_0==103) ) {
-                            int LA114_2 = input.LA(2);
+                        if ( (LA112_0==105) ) {
+                            int LA112_2 = input.LA(2);
 
                             if ( (synpred44_InternalMenuDsl()) ) {
-                                alt114=1;
+                                alt112=1;
                             }
 
 
                         }
 
 
-                        switch (alt114) {
+                        switch (alt112) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:6347:6: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalMenuDsl.g:6447:6: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
                     	    {
-                    	    // InternalMenuDsl.g:6348:6: (lv_catchClauses_3_0= ruleXCatchClause )
-                    	    // InternalMenuDsl.g:6349:7: lv_catchClauses_3_0= ruleXCatchClause
+                    	    // InternalMenuDsl.g:6448:6: (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalMenuDsl.g:6449:7: lv_catchClauses_3_0= ruleXCatchClause
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -17283,34 +17568,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    if ( cnt114 >= 1 ) break loop114;
+                    	    if ( cnt112 >= 1 ) break loop112;
                     	    if (state.backtracking>0) {state.failed=true; return current;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(114, input);
+                                    new EarlyExitException(112, input);
                                 throw eee;
                         }
-                        cnt114++;
+                        cnt112++;
                     } while (true);
 
-                    // InternalMenuDsl.g:6366:5: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
-                    int alt115=2;
-                    int LA115_0 = input.LA(1);
+                    // InternalMenuDsl.g:6466:5: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    int alt113=2;
+                    int LA113_0 = input.LA(1);
 
-                    if ( (LA115_0==101) ) {
-                        int LA115_1 = input.LA(2);
+                    if ( (LA113_0==103) ) {
+                        int LA113_1 = input.LA(2);
 
                         if ( (synpred45_InternalMenuDsl()) ) {
-                            alt115=1;
+                            alt113=1;
                         }
                     }
-                    switch (alt115) {
+                    switch (alt113) {
                         case 1 :
-                            // InternalMenuDsl.g:6367:6: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalMenuDsl.g:6467:6: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
                             {
-                            // InternalMenuDsl.g:6367:6: ( ( 'finally' )=>otherlv_4= 'finally' )
-                            // InternalMenuDsl.g:6368:7: ( 'finally' )=>otherlv_4= 'finally'
+                            // InternalMenuDsl.g:6467:6: ( ( 'finally' )=>otherlv_4= 'finally' )
+                            // InternalMenuDsl.g:6468:7: ( 'finally' )=>otherlv_4= 'finally'
                             {
-                            otherlv_4=(Token)match(input,101,FOLLOW_27); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,103,FOLLOW_28); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               							newLeafNode(otherlv_4, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0());
@@ -17319,11 +17604,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:6374:6: ( (lv_finallyExpression_5_0= ruleXExpression ) )
-                            // InternalMenuDsl.g:6375:7: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalMenuDsl.g:6474:6: ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalMenuDsl.g:6475:7: (lv_finallyExpression_5_0= ruleXExpression )
                             {
-                            // InternalMenuDsl.g:6375:7: (lv_finallyExpression_5_0= ruleXExpression )
-                            // InternalMenuDsl.g:6376:8: lv_finallyExpression_5_0= ruleXExpression
+                            // InternalMenuDsl.g:6475:7: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalMenuDsl.g:6476:8: lv_finallyExpression_5_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
 
@@ -17367,22 +17652,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:6396:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalMenuDsl.g:6496:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
                     {
-                    // InternalMenuDsl.g:6396:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
-                    // InternalMenuDsl.g:6397:5: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:6496:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalMenuDsl.g:6497:5: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,101,FOLLOW_27); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,103,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_6, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0());
                       				
                     }
-                    // InternalMenuDsl.g:6401:5: ( (lv_finallyExpression_7_0= ruleXExpression ) )
-                    // InternalMenuDsl.g:6402:6: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:6501:5: ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalMenuDsl.g:6502:6: (lv_finallyExpression_7_0= ruleXExpression )
                     {
-                    // InternalMenuDsl.g:6402:6: (lv_finallyExpression_7_0= ruleXExpression )
-                    // InternalMenuDsl.g:6403:7: lv_finallyExpression_7_0= ruleXExpression
+                    // InternalMenuDsl.g:6502:6: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalMenuDsl.g:6503:7: lv_finallyExpression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
 
@@ -17447,7 +17732,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // InternalMenuDsl.g:6426:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
+    // InternalMenuDsl.g:6526:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
     public final EObject entryRuleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17455,8 +17740,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6426:64: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
-            // InternalMenuDsl.g:6427:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
+            // InternalMenuDsl.g:6526:64: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
+            // InternalMenuDsl.g:6527:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSynchronizedExpressionRule()); 
@@ -17487,7 +17772,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // InternalMenuDsl.g:6433:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalMenuDsl.g:6533: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;
 
@@ -17503,20 +17788,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6439:2: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // InternalMenuDsl.g:6440:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:6539:2: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalMenuDsl.g:6540:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // InternalMenuDsl.g:6440:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
-            // InternalMenuDsl.g:6441:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6540:2: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:6541:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // InternalMenuDsl.g:6441:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
-            // InternalMenuDsl.g:6442:4: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalMenuDsl.g:6541:3: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
+            // InternalMenuDsl.g:6542:4: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
             {
-            // InternalMenuDsl.g:6449:4: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
-            // InternalMenuDsl.g:6450:5: () otherlv_1= 'synchronized' otherlv_2= '('
+            // InternalMenuDsl.g:6549:4: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalMenuDsl.g:6550:5: () otherlv_1= 'synchronized' otherlv_2= '('
             {
-            // InternalMenuDsl.g:6450:5: ()
-            // InternalMenuDsl.g:6451:6: 
+            // InternalMenuDsl.g:6550:5: ()
+            // InternalMenuDsl.g:6551:6: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17528,13 +17813,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,102,FOLLOW_66); 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.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1());
               				
             }
-            otherlv_2=(Token)match(input,39,FOLLOW_27); if (state.failed) return current;
+            otherlv_2=(Token)match(input,41,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               					newLeafNode(otherlv_2, grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2());
@@ -17546,18 +17831,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:6467:3: ( (lv_param_3_0= ruleXExpression ) )
-            // InternalMenuDsl.g:6468:4: (lv_param_3_0= ruleXExpression )
+            // InternalMenuDsl.g:6567:3: ( (lv_param_3_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6568:4: (lv_param_3_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:6468:4: (lv_param_3_0= ruleXExpression )
-            // InternalMenuDsl.g:6469:5: lv_param_3_0= ruleXExpression
+            // InternalMenuDsl.g:6568:4: (lv_param_3_0= ruleXExpression )
+            // InternalMenuDsl.g:6569:5: lv_param_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0());
               				
             }
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_26);
             lv_param_3_0=ruleXExpression();
 
             state._fsp--;
@@ -17581,17 +17866,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,41,FOLLOW_27); if (state.failed) return current;
+            otherlv_4=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_4, grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2());
               		
             }
-            // InternalMenuDsl.g:6490:3: ( (lv_expression_5_0= ruleXExpression ) )
-            // InternalMenuDsl.g:6491:4: (lv_expression_5_0= ruleXExpression )
+            // InternalMenuDsl.g:6590:3: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6591:4: (lv_expression_5_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:6491:4: (lv_expression_5_0= ruleXExpression )
-            // InternalMenuDsl.g:6492:5: lv_expression_5_0= ruleXExpression
+            // InternalMenuDsl.g:6591:4: (lv_expression_5_0= ruleXExpression )
+            // InternalMenuDsl.g:6592:5: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -17647,7 +17932,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // InternalMenuDsl.g:6513:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
+    // InternalMenuDsl.g:6613:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
     public final EObject entryRuleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -17655,8 +17940,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6513:53: (iv_ruleXCatchClause= ruleXCatchClause EOF )
-            // InternalMenuDsl.g:6514:2: iv_ruleXCatchClause= ruleXCatchClause EOF
+            // InternalMenuDsl.g:6613:53: (iv_ruleXCatchClause= ruleXCatchClause EOF )
+            // InternalMenuDsl.g:6614:2: iv_ruleXCatchClause= ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCatchClauseRule()); 
@@ -17687,7 +17972,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // InternalMenuDsl.g:6520:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
+    // InternalMenuDsl.g:6620: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;
 
@@ -17703,16 +17988,16 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6526:2: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
-            // InternalMenuDsl.g:6527:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:6626:2: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
+            // InternalMenuDsl.g:6627:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
             {
-            // InternalMenuDsl.g:6527:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
-            // InternalMenuDsl.g:6528:3: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6627:2: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalMenuDsl.g:6628:3: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
             {
-            // InternalMenuDsl.g:6528:3: ( ( 'catch' )=>otherlv_0= 'catch' )
-            // InternalMenuDsl.g:6529:4: ( 'catch' )=>otherlv_0= 'catch'
+            // InternalMenuDsl.g:6628:3: ( ( 'catch' )=>otherlv_0= 'catch' )
+            // InternalMenuDsl.g:6629:4: ( 'catch' )=>otherlv_0= 'catch'
             {
-            otherlv_0=(Token)match(input,103,FOLLOW_66); if (state.failed) return current;
+            otherlv_0=(Token)match(input,105,FOLLOW_66); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               				newLeafNode(otherlv_0, grammarAccess.getXCatchClauseAccess().getCatchKeyword_0());
@@ -17721,24 +18006,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,39,FOLLOW_40); if (state.failed) return current;
+            otherlv_1=(Token)match(input,41,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1());
               		
             }
-            // InternalMenuDsl.g:6539:3: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
-            // InternalMenuDsl.g:6540:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalMenuDsl.g:6639:3: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
+            // InternalMenuDsl.g:6640:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
             {
-            // InternalMenuDsl.g:6540:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
-            // InternalMenuDsl.g:6541:5: lv_declaredParam_2_0= ruleFullJvmFormalParameter
+            // InternalMenuDsl.g:6640:4: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalMenuDsl.g:6641:5: lv_declaredParam_2_0= ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
 
               					newCompositeNode(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0());
               				
             }
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_26);
             lv_declaredParam_2_0=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -17762,17 +18047,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,41,FOLLOW_27); if (state.failed) return current;
+            otherlv_3=(Token)match(input,43,FOLLOW_28); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_3, grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3());
               		
             }
-            // InternalMenuDsl.g:6562:3: ( (lv_expression_4_0= ruleXExpression ) )
-            // InternalMenuDsl.g:6563:4: (lv_expression_4_0= ruleXExpression )
+            // InternalMenuDsl.g:6662:3: ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalMenuDsl.g:6663:4: (lv_expression_4_0= ruleXExpression )
             {
-            // InternalMenuDsl.g:6563:4: (lv_expression_4_0= ruleXExpression )
-            // InternalMenuDsl.g:6564:5: lv_expression_4_0= ruleXExpression
+            // InternalMenuDsl.g:6663:4: (lv_expression_4_0= ruleXExpression )
+            // InternalMenuDsl.g:6664:5: lv_expression_4_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
 
@@ -17828,7 +18113,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalMenuDsl.g:6585:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalMenuDsl.g:6685:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -17836,8 +18121,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6585:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalMenuDsl.g:6586:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalMenuDsl.g:6685:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalMenuDsl.g:6686:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameRule()); 
@@ -17868,7 +18153,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalMenuDsl.g:6592:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+    // InternalMenuDsl.g:6692: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();
 
@@ -17882,11 +18167,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6598:2: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
-            // InternalMenuDsl.g:6599:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalMenuDsl.g:6698:2: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+            // InternalMenuDsl.g:6699:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
             {
-            // InternalMenuDsl.g:6599:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
-            // InternalMenuDsl.g:6600:3: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalMenuDsl.g:6699:2: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalMenuDsl.g:6700:3: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             {
             if ( state.backtracking==0 ) {
 
@@ -17908,20 +18193,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            // InternalMenuDsl.g:6610:3: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
-            loop117:
+            // InternalMenuDsl.g:6710:3: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            loop115:
             do {
-                int alt117=2;
-                int LA117_0 = input.LA(1);
+                int alt115=2;
+                int LA115_0 = input.LA(1);
 
-                if ( (LA117_0==76) ) {
-                    int LA117_2 = input.LA(2);
+                if ( (LA115_0==78) ) {
+                    int LA115_2 = input.LA(2);
 
-                    if ( (LA117_2==RULE_ID) ) {
-                        int LA117_3 = input.LA(3);
+                    if ( (LA115_2==RULE_ID) ) {
+                        int LA115_3 = input.LA(3);
 
                         if ( (synpred48_InternalMenuDsl()) ) {
-                            alt117=1;
+                            alt115=1;
                         }
 
 
@@ -17931,14 +18216,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                 }
 
 
-                switch (alt117) {
+                switch (alt115) {
             	case 1 :
-            	    // InternalMenuDsl.g:6611:4: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+            	    // InternalMenuDsl.g:6711:4: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
             	    {
-            	    // InternalMenuDsl.g:6611:4: ( ( '.' )=>kw= '.' )
-            	    // InternalMenuDsl.g:6612:5: ( '.' )=>kw= '.'
+            	    // InternalMenuDsl.g:6711:4: ( ( '.' )=>kw= '.' )
+            	    // InternalMenuDsl.g:6712:5: ( '.' )=>kw= '.'
             	    {
-            	    kw=(Token)match(input,76,FOLLOW_4); if (state.failed) return current;
+            	    kw=(Token)match(input,78,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      					current.merge(kw);
@@ -17973,7 +18258,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    break loop117;
+            	    break loop115;
                 }
             } while (true);
 
@@ -18002,7 +18287,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNumber"
-    // InternalMenuDsl.g:6634:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
+    // InternalMenuDsl.g:6734:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
     public final String entryRuleNumber() throws RecognitionException {
         String current = null;
 
@@ -18013,8 +18298,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // InternalMenuDsl.g:6636:2: (iv_ruleNumber= ruleNumber EOF )
-            // InternalMenuDsl.g:6637:2: iv_ruleNumber= ruleNumber EOF
+            // InternalMenuDsl.g:6736:2: (iv_ruleNumber= ruleNumber EOF )
+            // InternalMenuDsl.g:6737:2: iv_ruleNumber= ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNumberRule()); 
@@ -18048,7 +18333,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNumber"
-    // InternalMenuDsl.g:6646: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 ) )? ) ) ;
+    // InternalMenuDsl.g:6746: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();
 
@@ -18064,29 +18349,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // InternalMenuDsl.g:6653: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 ) )? ) ) )
-            // InternalMenuDsl.g:6654: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 ) )? ) )
+            // InternalMenuDsl.g:6753: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 ) )? ) ) )
+            // InternalMenuDsl.g:6754: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 ) )? ) )
             {
-            // InternalMenuDsl.g:6654: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 alt121=2;
-            int LA121_0 = input.LA(1);
+            // InternalMenuDsl.g:6754: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 alt119=2;
+            int LA119_0 = input.LA(1);
 
-            if ( (LA121_0==RULE_HEX) ) {
-                alt121=1;
+            if ( (LA119_0==RULE_HEX) ) {
+                alt119=1;
             }
-            else if ( ((LA121_0>=RULE_INT && LA121_0<=RULE_DECIMAL)) ) {
-                alt121=2;
+            else if ( ((LA119_0>=RULE_INT && LA119_0<=RULE_DECIMAL)) ) {
+                alt119=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 121, 0, input);
+                    new NoViableAltException("", 119, 0, input);
 
                 throw nvae;
             }
-            switch (alt121) {
+            switch (alt119) {
                 case 1 :
-                    // InternalMenuDsl.g:6655:3: this_HEX_0= RULE_HEX
+                    // InternalMenuDsl.g:6755: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 ) {
@@ -18103,31 +18388,31 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:6663:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalMenuDsl.g:6763:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
                     {
-                    // InternalMenuDsl.g:6663:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
-                    // InternalMenuDsl.g:6664:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalMenuDsl.g:6763:3: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalMenuDsl.g:6764:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     {
-                    // InternalMenuDsl.g:6664:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
-                    int alt118=2;
-                    int LA118_0 = input.LA(1);
+                    // InternalMenuDsl.g:6764:4: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
+                    int alt116=2;
+                    int LA116_0 = input.LA(1);
 
-                    if ( (LA118_0==RULE_INT) ) {
-                        alt118=1;
+                    if ( (LA116_0==RULE_INT) ) {
+                        alt116=1;
                     }
-                    else if ( (LA118_0==RULE_DECIMAL) ) {
-                        alt118=2;
+                    else if ( (LA116_0==RULE_DECIMAL) ) {
+                        alt116=2;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 118, 0, input);
+                            new NoViableAltException("", 116, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt118) {
+                    switch (alt116) {
                         case 1 :
-                            // InternalMenuDsl.g:6665:5: this_INT_1= RULE_INT
+                            // InternalMenuDsl.g:6765:5: this_INT_1= RULE_INT
                             {
                             this_INT_1=(Token)match(input,RULE_INT,FOLLOW_90); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
@@ -18144,7 +18429,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             }
                             break;
                         case 2 :
-                            // InternalMenuDsl.g:6673:5: this_DECIMAL_2= RULE_DECIMAL
+                            // InternalMenuDsl.g:6773:5: this_DECIMAL_2= RULE_DECIMAL
                             {
                             this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_90); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
@@ -18163,48 +18448,48 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:6681:4: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
-                    int alt120=2;
-                    int LA120_0 = input.LA(1);
+                    // InternalMenuDsl.g:6781:4: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    int alt118=2;
+                    int LA118_0 = input.LA(1);
 
-                    if ( (LA120_0==76) ) {
-                        int LA120_1 = input.LA(2);
+                    if ( (LA118_0==78) ) {
+                        int LA118_1 = input.LA(2);
 
-                        if ( ((LA120_1>=RULE_INT && LA120_1<=RULE_DECIMAL)) ) {
-                            alt120=1;
+                        if ( ((LA118_1>=RULE_INT && LA118_1<=RULE_DECIMAL)) ) {
+                            alt118=1;
                         }
                     }
-                    switch (alt120) {
+                    switch (alt118) {
                         case 1 :
-                            // InternalMenuDsl.g:6682:5: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalMenuDsl.g:6782:5: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             {
-                            kw=(Token)match(input,76,FOLLOW_91); if (state.failed) return current;
+                            kw=(Token)match(input,78,FOLLOW_91); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               					current.merge(kw);
                               					newLeafNode(kw, grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0());
                               				
                             }
-                            // InternalMenuDsl.g:6687:5: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
-                            int alt119=2;
-                            int LA119_0 = input.LA(1);
+                            // InternalMenuDsl.g:6787:5: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            int alt117=2;
+                            int LA117_0 = input.LA(1);
 
-                            if ( (LA119_0==RULE_INT) ) {
-                                alt119=1;
+                            if ( (LA117_0==RULE_INT) ) {
+                                alt117=1;
                             }
-                            else if ( (LA119_0==RULE_DECIMAL) ) {
-                                alt119=2;
+                            else if ( (LA117_0==RULE_DECIMAL) ) {
+                                alt117=2;
                             }
                             else {
                                 if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("", 119, 0, input);
+                                    new NoViableAltException("", 117, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt119) {
+                            switch (alt117) {
                                 case 1 :
-                                    // InternalMenuDsl.g:6688:6: this_INT_4= RULE_INT
+                                    // InternalMenuDsl.g:6788: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 ) {
@@ -18221,7 +18506,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                                     }
                                     break;
                                 case 2 :
-                                    // InternalMenuDsl.g:6696:6: this_DECIMAL_5= RULE_DECIMAL
+                                    // InternalMenuDsl.g:6796: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 ) {
@@ -18280,7 +18565,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // InternalMenuDsl.g:6713:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
+    // InternalMenuDsl.g:6813:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
     public final EObject entryRuleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -18288,8 +18573,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6713:57: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
-            // InternalMenuDsl.g:6714:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
+            // InternalMenuDsl.g:6813:57: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
+            // InternalMenuDsl.g:6814:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmTypeReferenceRule()); 
@@ -18320,7 +18605,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // InternalMenuDsl.g:6720:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
+    // InternalMenuDsl.g:6820: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;
 
@@ -18333,32 +18618,32 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6726:2: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
-            // InternalMenuDsl.g:6727:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalMenuDsl.g:6826:2: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
+            // InternalMenuDsl.g:6827:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             {
-            // InternalMenuDsl.g:6727:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
-            int alt123=2;
-            int LA123_0 = input.LA(1);
+            // InternalMenuDsl.g:6827:2: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            int alt121=2;
+            int LA121_0 = input.LA(1);
 
-            if ( (LA123_0==RULE_ID) ) {
-                alt123=1;
+            if ( (LA121_0==RULE_ID) ) {
+                alt121=1;
             }
-            else if ( (LA123_0==39||LA123_0==64) ) {
-                alt123=2;
+            else if ( (LA121_0==41||LA121_0==66) ) {
+                alt121=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 123, 0, input);
+                    new NoViableAltException("", 121, 0, input);
 
                 throw nvae;
             }
-            switch (alt123) {
+            switch (alt121) {
                 case 1 :
-                    // InternalMenuDsl.g:6728:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalMenuDsl.g:6828:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
                     {
-                    // InternalMenuDsl.g:6728:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
-                    // InternalMenuDsl.g:6729:4: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalMenuDsl.g:6828:3: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalMenuDsl.g:6829:4: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     {
                     if ( state.backtracking==0 ) {
 
@@ -18376,20 +18661,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                       				afterParserOrEnumRuleCall();
                       			
                     }
-                    // InternalMenuDsl.g:6737:4: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
-                    loop122:
+                    // InternalMenuDsl.g:6837:4: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    loop120:
                     do {
-                        int alt122=2;
-                        int LA122_0 = input.LA(1);
+                        int alt120=2;
+                        int LA120_0 = input.LA(1);
 
-                        if ( (LA122_0==44) ) {
-                            int LA122_2 = input.LA(2);
+                        if ( (LA120_0==46) ) {
+                            int LA120_2 = input.LA(2);
 
-                            if ( (LA122_2==45) ) {
-                                int LA122_3 = input.LA(3);
+                            if ( (LA120_2==47) ) {
+                                int LA120_3 = input.LA(3);
 
                                 if ( (synpred49_InternalMenuDsl()) ) {
-                                    alt122=1;
+                                    alt120=1;
                                 }
 
 
@@ -18399,15 +18684,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         }
 
 
-                        switch (alt122) {
+                        switch (alt120) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:6738:5: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
+                    	    // InternalMenuDsl.g:6838:5: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
                     	    {
-                    	    // InternalMenuDsl.g:6744:5: ( () ruleArrayBrackets )
-                    	    // InternalMenuDsl.g:6745:6: () ruleArrayBrackets
+                    	    // InternalMenuDsl.g:6844:5: ( () ruleArrayBrackets )
+                    	    // InternalMenuDsl.g:6845:6: () ruleArrayBrackets
                     	    {
-                    	    // InternalMenuDsl.g:6745:6: ()
-                    	    // InternalMenuDsl.g:6746:7: 
+                    	    // InternalMenuDsl.g:6845:6: ()
+                    	    // InternalMenuDsl.g:6846:7: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -18442,7 +18727,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop122;
+                    	    break loop120;
                         }
                     } while (true);
 
@@ -18453,7 +18738,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:6763:3: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
+                    // InternalMenuDsl.g:6863:3: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
 
@@ -18499,7 +18784,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // InternalMenuDsl.g:6775:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
+    // InternalMenuDsl.g:6875:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
     public final String entryRuleArrayBrackets() throws RecognitionException {
         String current = null;
 
@@ -18507,8 +18792,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6775:53: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
-            // InternalMenuDsl.g:6776:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
+            // InternalMenuDsl.g:6875:53: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
+            // InternalMenuDsl.g:6876:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getArrayBracketsRule()); 
@@ -18539,7 +18824,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // InternalMenuDsl.g:6782:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
+    // InternalMenuDsl.g:6882:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
     public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -18549,20 +18834,20 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6788:2: ( (kw= '[' kw= ']' ) )
-            // InternalMenuDsl.g:6789:2: (kw= '[' kw= ']' )
+            // InternalMenuDsl.g:6888:2: ( (kw= '[' kw= ']' ) )
+            // InternalMenuDsl.g:6889:2: (kw= '[' kw= ']' )
             {
-            // InternalMenuDsl.g:6789:2: (kw= '[' kw= ']' )
-            // InternalMenuDsl.g:6790:3: kw= '[' kw= ']'
+            // InternalMenuDsl.g:6889:2: (kw= '[' kw= ']' )
+            // InternalMenuDsl.g:6890:3: kw= '[' kw= ']'
             {
-            kw=(Token)match(input,44,FOLLOW_63); if (state.failed) return current;
+            kw=(Token)match(input,46,FOLLOW_63); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
               			newLeafNode(kw, grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0());
               		
             }
-            kw=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
@@ -18594,7 +18879,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // InternalMenuDsl.g:6804:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
+    // InternalMenuDsl.g:6904:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
     public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -18602,8 +18887,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6804:57: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
-            // InternalMenuDsl.g:6805:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
+            // InternalMenuDsl.g:6904:57: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
+            // InternalMenuDsl.g:6905:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFunctionTypeRefRule()); 
@@ -18634,7 +18919,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // InternalMenuDsl.g:6811: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 ) ) ) ;
+    // InternalMenuDsl.g:6911: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;
 
@@ -18653,52 +18938,52 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6817:2: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
-            // InternalMenuDsl.g:6818:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:6917:2: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
+            // InternalMenuDsl.g:6918:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
             {
-            // InternalMenuDsl.g:6818:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
-            // InternalMenuDsl.g:6819:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:6918:2: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:6919:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
             {
-            // InternalMenuDsl.g:6819:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
-            int alt126=2;
-            int LA126_0 = input.LA(1);
+            // InternalMenuDsl.g:6919:3: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
+            int alt124=2;
+            int LA124_0 = input.LA(1);
 
-            if ( (LA126_0==39) ) {
-                alt126=1;
+            if ( (LA124_0==41) ) {
+                alt124=1;
             }
-            switch (alt126) {
+            switch (alt124) {
                 case 1 :
-                    // InternalMenuDsl.g:6820:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
+                    // InternalMenuDsl.g:6920:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
                     {
-                    otherlv_0=(Token)match(input,39,FOLLOW_92); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,41,FOLLOW_92); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_0, grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0());
                       			
                     }
-                    // InternalMenuDsl.g:6824:4: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
-                    int alt125=2;
-                    int LA125_0 = input.LA(1);
+                    // InternalMenuDsl.g:6924:4: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
+                    int alt123=2;
+                    int LA123_0 = input.LA(1);
 
-                    if ( (LA125_0==RULE_ID||LA125_0==39||LA125_0==64) ) {
-                        alt125=1;
+                    if ( (LA123_0==RULE_ID||LA123_0==41||LA123_0==66) ) {
+                        alt123=1;
                     }
-                    switch (alt125) {
+                    switch (alt123) {
                         case 1 :
-                            // InternalMenuDsl.g:6825:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalMenuDsl.g:6925:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             {
-                            // InternalMenuDsl.g:6825:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
-                            // InternalMenuDsl.g:6826:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalMenuDsl.g:6925:5: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
+                            // InternalMenuDsl.g:6926:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
                             {
-                            // InternalMenuDsl.g:6826:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
-                            // InternalMenuDsl.g:6827:7: lv_paramTypes_1_0= ruleJvmTypeReference
+                            // InternalMenuDsl.g:6926:6: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalMenuDsl.g:6927:7: lv_paramTypes_1_0= ruleJvmTypeReference
                             {
                             if ( state.backtracking==0 ) {
 
                               							newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0());
                               						
                             }
-                            pushFollow(FOLLOW_24);
+                            pushFollow(FOLLOW_25);
                             lv_paramTypes_1_0=ruleJvmTypeReference();
 
                             state._fsp--;
@@ -18722,39 +19007,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalMenuDsl.g:6844:5: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
-                            loop124:
+                            // InternalMenuDsl.g:6944:5: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            loop122:
                             do {
-                                int alt124=2;
-                                int LA124_0 = input.LA(1);
+                                int alt122=2;
+                                int LA122_0 = input.LA(1);
 
-                                if ( (LA124_0==40) ) {
-                                    alt124=1;
+                                if ( (LA122_0==42) ) {
+                                    alt122=1;
                                 }
 
 
-                                switch (alt124) {
+                                switch (alt122) {
                             	case 1 :
-                            	    // InternalMenuDsl.g:6845:6: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalMenuDsl.g:6945:6: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
                             	    {
-                            	    otherlv_2=(Token)match(input,40,FOLLOW_40); if (state.failed) return current;
+                            	    otherlv_2=(Token)match(input,42,FOLLOW_41); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	      						newLeafNode(otherlv_2, grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0());
                             	      					
                             	    }
-                            	    // InternalMenuDsl.g:6849:6: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
-                            	    // InternalMenuDsl.g:6850:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalMenuDsl.g:6949:6: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalMenuDsl.g:6950:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
                             	    {
-                            	    // InternalMenuDsl.g:6850:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
-                            	    // InternalMenuDsl.g:6851:8: lv_paramTypes_3_0= ruleJvmTypeReference
+                            	    // InternalMenuDsl.g:6950:7: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalMenuDsl.g:6951:8: lv_paramTypes_3_0= ruleJvmTypeReference
                             	    {
                             	    if ( state.backtracking==0 ) {
 
                             	      								newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0());
                             	      							
                             	    }
-                            	    pushFollow(FOLLOW_24);
+                            	    pushFollow(FOLLOW_25);
                             	    lv_paramTypes_3_0=ruleJvmTypeReference();
 
                             	    state._fsp--;
@@ -18783,7 +19068,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                             	    break;
 
                             	default :
-                            	    break loop124;
+                            	    break loop122;
                                 }
                             } while (true);
 
@@ -18793,7 +19078,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_4=(Token)match(input,41,FOLLOW_93); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,43,FOLLOW_93); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_4, grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2());
@@ -18805,17 +19090,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_5=(Token)match(input,64,FOLLOW_40); if (state.failed) return current;
+            otherlv_5=(Token)match(input,66,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_5, grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1());
               		
             }
-            // InternalMenuDsl.g:6879:3: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:6880:4: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:6979:3: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:6980:4: (lv_returnType_6_0= ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:6880:4: (lv_returnType_6_0= ruleJvmTypeReference )
-            // InternalMenuDsl.g:6881:5: lv_returnType_6_0= ruleJvmTypeReference
+            // InternalMenuDsl.g:6980:4: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:6981:5: lv_returnType_6_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -18871,7 +19156,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // InternalMenuDsl.g:6902:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
+    // InternalMenuDsl.g:7002:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
     public final EObject entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -18879,8 +19164,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:6902:70: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
-            // InternalMenuDsl.g:6903:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
+            // InternalMenuDsl.g:7002:70: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
+            // InternalMenuDsl.g:7003:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
@@ -18911,7 +19196,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // InternalMenuDsl.g:6909: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= '>' )? )* )? ) ;
+    // InternalMenuDsl.g:7009: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;
 
@@ -18935,17 +19220,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:6915: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= '>' )? )* )? ) )
-            // InternalMenuDsl.g:6916: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= '>' )? )* )? )
+            // InternalMenuDsl.g:7015: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= '>' )? )* )? ) )
+            // InternalMenuDsl.g:7016: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= '>' )? )* )? )
             {
-            // InternalMenuDsl.g:6916: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= '>' )? )* )? )
-            // InternalMenuDsl.g:6917: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= '>' )? )* )?
+            // InternalMenuDsl.g:7016: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= '>' )? )* )? )
+            // InternalMenuDsl.g:7017: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= '>' )? )* )?
             {
-            // InternalMenuDsl.g:6917:3: ( ( ruleQualifiedName ) )
-            // InternalMenuDsl.g:6918:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:7017:3: ( ( ruleQualifiedName ) )
+            // InternalMenuDsl.g:7018:4: ( ruleQualifiedName )
             {
-            // InternalMenuDsl.g:6918:4: ( ruleQualifiedName )
-            // InternalMenuDsl.g:6919:5: ruleQualifiedName
+            // InternalMenuDsl.g:7018:4: ( ruleQualifiedName )
+            // InternalMenuDsl.g:7019:5: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -18975,17 +19260,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalMenuDsl.g:6933: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 alt131=2;
-            alt131 = dfa131.predict(input);
-            switch (alt131) {
+            // InternalMenuDsl.g:7033: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 alt129=2;
+            alt129 = dfa129.predict(input);
+            switch (alt129) {
                 case 1 :
-                    // InternalMenuDsl.g:6934: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= '>' )? )*
+                    // InternalMenuDsl.g:7034: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= '>' )? )*
                     {
-                    // InternalMenuDsl.g:6934:4: ( ( '<' )=>otherlv_1= '<' )
-                    // InternalMenuDsl.g:6935:5: ( '<' )=>otherlv_1= '<'
+                    // InternalMenuDsl.g:7034:4: ( ( '<' )=>otherlv_1= '<' )
+                    // InternalMenuDsl.g:7035:5: ( '<' )=>otherlv_1= '<'
                     {
-                    otherlv_1=(Token)match(input,51,FOLLOW_52); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,53,FOLLOW_53); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       					newLeafNode(otherlv_1, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0());
@@ -18994,18 +19279,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:6941:4: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // InternalMenuDsl.g:6942:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalMenuDsl.g:7041:4: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalMenuDsl.g:7042:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // InternalMenuDsl.g:6942:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
-                    // InternalMenuDsl.g:6943:6: lv_arguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalMenuDsl.g:7042:5: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalMenuDsl.g:7043:6: lv_arguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
                       						newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0());
                       					
                     }
-                    pushFollow(FOLLOW_53);
+                    pushFollow(FOLLOW_54);
                     lv_arguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -19029,39 +19314,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:6960:4: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop127:
+                    // InternalMenuDsl.g:7060:4: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop125:
                     do {
-                        int alt127=2;
-                        int LA127_0 = input.LA(1);
+                        int alt125=2;
+                        int LA125_0 = input.LA(1);
 
-                        if ( (LA127_0==40) ) {
-                            alt127=1;
+                        if ( (LA125_0==42) ) {
+                            alt125=1;
                         }
 
 
-                        switch (alt127) {
+                        switch (alt125) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:6961:5: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalMenuDsl.g:7061:5: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,40,FOLLOW_52); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,42,FOLLOW_53); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      					newLeafNode(otherlv_3, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0());
                     	      				
                     	    }
-                    	    // InternalMenuDsl.g:6965:5: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // InternalMenuDsl.g:6966:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalMenuDsl.g:7065:5: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalMenuDsl.g:7066:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // InternalMenuDsl.g:6966:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // InternalMenuDsl.g:6967:7: lv_arguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalMenuDsl.g:7066:6: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalMenuDsl.g:7067:7: lv_arguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
 
                     	      							newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0());
                     	      						
                     	    }
-                    	    pushFollow(FOLLOW_53);
+                    	    pushFollow(FOLLOW_54);
                     	    lv_arguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -19090,30 +19375,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop127;
+                    	    break loop125;
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,52,FOLLOW_90); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,54,FOLLOW_90); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       				newLeafNode(otherlv_5, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3());
                       			
                     }
-                    // InternalMenuDsl.g:6989:4: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
-                    loop130:
+                    // InternalMenuDsl.g:7089:4: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    loop128:
                     do {
-                        int alt130=2;
-                        int LA130_0 = input.LA(1);
+                        int alt128=2;
+                        int LA128_0 = input.LA(1);
 
-                        if ( (LA130_0==76) ) {
-                            int LA130_2 = input.LA(2);
+                        if ( (LA128_0==78) ) {
+                            int LA128_2 = input.LA(2);
 
-                            if ( (LA130_2==RULE_ID) ) {
-                                int LA130_3 = input.LA(3);
+                            if ( (LA128_2==RULE_ID) ) {
+                                int LA128_3 = input.LA(3);
 
                                 if ( (synpred51_InternalMenuDsl()) ) {
-                                    alt130=1;
+                                    alt128=1;
                                 }
 
 
@@ -19123,18 +19408,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         }
 
 
-                        switch (alt130) {
+                        switch (alt128) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:6990:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalMenuDsl.g:7090:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    {
-                    	    // InternalMenuDsl.g:6990:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
-                    	    // InternalMenuDsl.g:6991:6: ( ( () '.' ) )=> ( () otherlv_7= '.' )
+                    	    // InternalMenuDsl.g:7090:5: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
+                    	    // InternalMenuDsl.g:7091:6: ( ( () '.' ) )=> ( () otherlv_7= '.' )
                     	    {
-                    	    // InternalMenuDsl.g:6997:6: ( () otherlv_7= '.' )
-                    	    // InternalMenuDsl.g:6998:7: () otherlv_7= '.'
+                    	    // InternalMenuDsl.g:7097:6: ( () otherlv_7= '.' )
+                    	    // InternalMenuDsl.g:7098:7: () otherlv_7= '.'
                     	    {
-                    	    // InternalMenuDsl.g:6998:7: ()
-                    	    // InternalMenuDsl.g:6999:8: 
+                    	    // InternalMenuDsl.g:7098:7: ()
+                    	    // InternalMenuDsl.g:7099:8: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -19146,7 +19431,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     	    }
 
-                    	    otherlv_7=(Token)match(input,76,FOLLOW_4); if (state.failed) return current;
+                    	    otherlv_7=(Token)match(input,78,FOLLOW_4); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	      							newLeafNode(otherlv_7, grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1());
@@ -19158,11 +19443,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     	    }
 
-                    	    // InternalMenuDsl.g:7011:5: ( ( ruleValidID ) )
-                    	    // InternalMenuDsl.g:7012:6: ( ruleValidID )
+                    	    // InternalMenuDsl.g:7111:5: ( ( ruleValidID ) )
+                    	    // InternalMenuDsl.g:7112:6: ( ruleValidID )
                     	    {
-                    	    // InternalMenuDsl.g:7012:6: ( ruleValidID )
-                    	    // InternalMenuDsl.g:7013:7: ruleValidID
+                    	    // InternalMenuDsl.g:7112:6: ( ruleValidID )
+                    	    // InternalMenuDsl.g:7113:7: ruleValidID
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -19192,17 +19477,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     	    }
 
-                    	    // InternalMenuDsl.g:7027:5: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
-                    	    int alt129=2;
-                    	    alt129 = dfa129.predict(input);
-                    	    switch (alt129) {
+                    	    // InternalMenuDsl.g:7127:5: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    int alt127=2;
+                    	    alt127 = dfa127.predict(input);
+                    	    switch (alt127) {
                     	        case 1 :
-                    	            // InternalMenuDsl.g:7028:6: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
+                    	            // InternalMenuDsl.g:7128:6: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
                     	            {
-                    	            // InternalMenuDsl.g:7028:6: ( ( '<' )=>otherlv_9= '<' )
-                    	            // InternalMenuDsl.g:7029:7: ( '<' )=>otherlv_9= '<'
+                    	            // InternalMenuDsl.g:7128:6: ( ( '<' )=>otherlv_9= '<' )
+                    	            // InternalMenuDsl.g:7129:7: ( '<' )=>otherlv_9= '<'
                     	            {
-                    	            otherlv_9=(Token)match(input,51,FOLLOW_52); if (state.failed) return current;
+                    	            otherlv_9=(Token)match(input,53,FOLLOW_53); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	              							newLeafNode(otherlv_9, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0());
@@ -19211,18 +19496,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     	            }
 
-                    	            // InternalMenuDsl.g:7035:6: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
-                    	            // InternalMenuDsl.g:7036:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalMenuDsl.g:7135:6: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
+                    	            // InternalMenuDsl.g:7136:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
                     	            {
-                    	            // InternalMenuDsl.g:7036:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
-                    	            // InternalMenuDsl.g:7037:8: lv_arguments_10_0= ruleJvmArgumentTypeReference
+                    	            // InternalMenuDsl.g:7136:7: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalMenuDsl.g:7137:8: lv_arguments_10_0= ruleJvmArgumentTypeReference
                     	            {
                     	            if ( state.backtracking==0 ) {
 
                     	              								newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0());
                     	              							
                     	            }
-                    	            pushFollow(FOLLOW_53);
+                    	            pushFollow(FOLLOW_54);
                     	            lv_arguments_10_0=ruleJvmArgumentTypeReference();
 
                     	            state._fsp--;
@@ -19246,39 +19531,39 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     	            }
 
-                    	            // InternalMenuDsl.g:7054:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
-                    	            loop128:
+                    	            // InternalMenuDsl.g:7154:6: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
+                    	            loop126:
                     	            do {
-                    	                int alt128=2;
-                    	                int LA128_0 = input.LA(1);
+                    	                int alt126=2;
+                    	                int LA126_0 = input.LA(1);
 
-                    	                if ( (LA128_0==40) ) {
-                    	                    alt128=1;
+                    	                if ( (LA126_0==42) ) {
+                    	                    alt126=1;
                     	                }
 
 
-                    	                switch (alt128) {
+                    	                switch (alt126) {
                     	            	case 1 :
-                    	            	    // InternalMenuDsl.g:7055:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalMenuDsl.g:7155:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
                     	            	    {
-                    	            	    otherlv_11=(Token)match(input,40,FOLLOW_52); if (state.failed) return current;
+                    	            	    otherlv_11=(Token)match(input,42,FOLLOW_53); if (state.failed) return current;
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	      							newLeafNode(otherlv_11, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0());
                     	            	      						
                     	            	    }
-                    	            	    // InternalMenuDsl.g:7059:7: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
-                    	            	    // InternalMenuDsl.g:7060:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalMenuDsl.g:7159:7: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalMenuDsl.g:7160:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
                     	            	    {
-                    	            	    // InternalMenuDsl.g:7060:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
-                    	            	    // InternalMenuDsl.g:7061:9: lv_arguments_12_0= ruleJvmArgumentTypeReference
+                    	            	    // InternalMenuDsl.g:7160:8: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalMenuDsl.g:7161:9: lv_arguments_12_0= ruleJvmArgumentTypeReference
                     	            	    {
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	      									newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0());
                     	            	      								
                     	            	    }
-                    	            	    pushFollow(FOLLOW_53);
+                    	            	    pushFollow(FOLLOW_54);
                     	            	    lv_arguments_12_0=ruleJvmArgumentTypeReference();
 
                     	            	    state._fsp--;
@@ -19307,11 +19592,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	            	    break;
 
                     	            	default :
-                    	            	    break loop128;
+                    	            	    break loop126;
                     	                }
                     	            } while (true);
 
-                    	            otherlv_13=(Token)match(input,52,FOLLOW_90); if (state.failed) return current;
+                    	            otherlv_13=(Token)match(input,54,FOLLOW_90); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	              						newLeafNode(otherlv_13, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3());
@@ -19328,7 +19613,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop130;
+                    	    break loop128;
                         }
                     } while (true);
 
@@ -19363,7 +19648,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // InternalMenuDsl.g:7090:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
+    // InternalMenuDsl.g:7190:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
     public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -19371,8 +19656,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7090:65: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
-            // InternalMenuDsl.g:7091:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
+            // InternalMenuDsl.g:7190:65: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
+            // InternalMenuDsl.g:7191:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceRule()); 
@@ -19403,7 +19688,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // InternalMenuDsl.g:7097:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
+    // InternalMenuDsl.g:7197:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
     public final EObject ruleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -19416,29 +19701,29 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7103:2: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
-            // InternalMenuDsl.g:7104:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalMenuDsl.g:7203:2: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
+            // InternalMenuDsl.g:7204:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             {
-            // InternalMenuDsl.g:7104:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
-            int alt132=2;
-            int LA132_0 = input.LA(1);
+            // InternalMenuDsl.g:7204:2: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            int alt130=2;
+            int LA130_0 = input.LA(1);
 
-            if ( (LA132_0==RULE_ID||LA132_0==39||LA132_0==64) ) {
-                alt132=1;
+            if ( (LA130_0==RULE_ID||LA130_0==41||LA130_0==66) ) {
+                alt130=1;
             }
-            else if ( (LA132_0==104) ) {
-                alt132=2;
+            else if ( (LA130_0==106) ) {
+                alt130=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 132, 0, input);
+                    new NoViableAltException("", 130, 0, input);
 
                 throw nvae;
             }
-            switch (alt132) {
+            switch (alt130) {
                 case 1 :
-                    // InternalMenuDsl.g:7105:3: this_JvmTypeReference_0= ruleJvmTypeReference
+                    // InternalMenuDsl.g:7205:3: this_JvmTypeReference_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19460,7 +19745,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:7114:3: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
+                    // InternalMenuDsl.g:7214:3: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19506,7 +19791,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // InternalMenuDsl.g:7126:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
+    // InternalMenuDsl.g:7226:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
     public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -19514,8 +19799,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7126:65: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
-            // InternalMenuDsl.g:7127:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
+            // InternalMenuDsl.g:7226:65: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
+            // InternalMenuDsl.g:7227:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceRule()); 
@@ -19546,7 +19831,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // InternalMenuDsl.g:7133: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 ) )* ) )? ) ;
+    // InternalMenuDsl.g:7233: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;
 
@@ -19564,14 +19849,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7139:2: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
-            // InternalMenuDsl.g:7140:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalMenuDsl.g:7239:2: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
+            // InternalMenuDsl.g:7240:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
             {
-            // InternalMenuDsl.g:7140:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
-            // InternalMenuDsl.g:7141:3: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalMenuDsl.g:7240:2: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalMenuDsl.g:7241:3: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             {
-            // InternalMenuDsl.g:7141:3: ()
-            // InternalMenuDsl.g:7142:4: 
+            // InternalMenuDsl.g:7241:3: ()
+            // InternalMenuDsl.g:7242:4: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19583,34 +19868,34 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,104,FOLLOW_96); if (state.failed) return current;
+            otherlv_1=(Token)match(input,106,FOLLOW_96); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_1, grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1());
               		
             }
-            // InternalMenuDsl.g:7152:3: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
-            int alt135=3;
-            int LA135_0 = input.LA(1);
+            // InternalMenuDsl.g:7252:3: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            int alt133=3;
+            int LA133_0 = input.LA(1);
 
-            if ( (LA135_0==91) ) {
-                alt135=1;
+            if ( (LA133_0==93) ) {
+                alt133=1;
             }
-            else if ( (LA135_0==92) ) {
-                alt135=2;
+            else if ( (LA133_0==94) ) {
+                alt133=2;
             }
-            switch (alt135) {
+            switch (alt133) {
                 case 1 :
-                    // InternalMenuDsl.g:7153:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalMenuDsl.g:7253:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
                     {
-                    // InternalMenuDsl.g:7153:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
-                    // InternalMenuDsl.g:7154:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalMenuDsl.g:7253:4: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalMenuDsl.g:7254:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     {
-                    // InternalMenuDsl.g:7154:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
-                    // InternalMenuDsl.g:7155:6: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalMenuDsl.g:7254:5: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
+                    // InternalMenuDsl.g:7255:6: (lv_constraints_2_0= ruleJvmUpperBound )
                     {
-                    // InternalMenuDsl.g:7155:6: (lv_constraints_2_0= ruleJvmUpperBound )
-                    // InternalMenuDsl.g:7156:7: lv_constraints_2_0= ruleJvmUpperBound
+                    // InternalMenuDsl.g:7255:6: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalMenuDsl.g:7256:7: lv_constraints_2_0= ruleJvmUpperBound
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19641,23 +19926,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:7173:5: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
-                    loop133:
+                    // InternalMenuDsl.g:7273:5: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    loop131:
                     do {
-                        int alt133=2;
-                        int LA133_0 = input.LA(1);
+                        int alt131=2;
+                        int LA131_0 = input.LA(1);
 
-                        if ( (LA133_0==105) ) {
-                            alt133=1;
+                        if ( (LA131_0==107) ) {
+                            alt131=1;
                         }
 
 
-                        switch (alt133) {
+                        switch (alt131) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:7174:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalMenuDsl.g:7274:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
                     	    {
-                    	    // InternalMenuDsl.g:7174:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
-                    	    // InternalMenuDsl.g:7175:7: lv_constraints_3_0= ruleJvmUpperBoundAnded
+                    	    // InternalMenuDsl.g:7274:6: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalMenuDsl.g:7275:7: lv_constraints_3_0= ruleJvmUpperBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -19690,7 +19975,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop133;
+                    	    break loop131;
                         }
                     } while (true);
 
@@ -19701,16 +19986,16 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalMenuDsl.g:7194:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalMenuDsl.g:7294:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
                     {
-                    // InternalMenuDsl.g:7194:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
-                    // InternalMenuDsl.g:7195:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalMenuDsl.g:7294:4: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalMenuDsl.g:7295:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     {
-                    // InternalMenuDsl.g:7195:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
-                    // InternalMenuDsl.g:7196:6: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalMenuDsl.g:7295:5: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
+                    // InternalMenuDsl.g:7296:6: (lv_constraints_4_0= ruleJvmLowerBound )
                     {
-                    // InternalMenuDsl.g:7196:6: (lv_constraints_4_0= ruleJvmLowerBound )
-                    // InternalMenuDsl.g:7197:7: lv_constraints_4_0= ruleJvmLowerBound
+                    // InternalMenuDsl.g:7296:6: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalMenuDsl.g:7297:7: lv_constraints_4_0= ruleJvmLowerBound
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19741,23 +20026,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalMenuDsl.g:7214:5: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
-                    loop134:
+                    // InternalMenuDsl.g:7314:5: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    loop132:
                     do {
-                        int alt134=2;
-                        int LA134_0 = input.LA(1);
+                        int alt132=2;
+                        int LA132_0 = input.LA(1);
 
-                        if ( (LA134_0==105) ) {
-                            alt134=1;
+                        if ( (LA132_0==107) ) {
+                            alt132=1;
                         }
 
 
-                        switch (alt134) {
+                        switch (alt132) {
                     	case 1 :
-                    	    // InternalMenuDsl.g:7215:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalMenuDsl.g:7315:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
                     	    {
-                    	    // InternalMenuDsl.g:7215:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
-                    	    // InternalMenuDsl.g:7216:7: lv_constraints_5_0= ruleJvmLowerBoundAnded
+                    	    // InternalMenuDsl.g:7315:6: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalMenuDsl.g:7316:7: lv_constraints_5_0= ruleJvmLowerBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -19790,7 +20075,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                     	    break;
 
                     	default :
-                    	    break loop134;
+                    	    break loop132;
                         }
                     } while (true);
 
@@ -19828,7 +20113,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // InternalMenuDsl.g:7239:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
+    // InternalMenuDsl.g:7339:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
     public final EObject entryRuleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -19836,8 +20121,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7239:54: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
-            // InternalMenuDsl.g:7240:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
+            // InternalMenuDsl.g:7339:54: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
+            // InternalMenuDsl.g:7340:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundRule()); 
@@ -19868,7 +20153,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // InternalMenuDsl.g:7246:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalMenuDsl.g:7346:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -19880,23 +20165,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7252:2: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalMenuDsl.g:7253:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7352:2: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalMenuDsl.g:7353:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalMenuDsl.g:7253:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalMenuDsl.g:7254:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7353:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7354:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,91,FOLLOW_40); if (state.failed) return current;
+            otherlv_0=(Token)match(input,93,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0());
               		
             }
-            // InternalMenuDsl.g:7258:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:7259:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7358:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7359:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:7259:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalMenuDsl.g:7260:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalMenuDsl.g:7359:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7360:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -19952,7 +20237,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // InternalMenuDsl.g:7281:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
+    // InternalMenuDsl.g:7381:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
     public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -19960,8 +20245,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7281:59: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
-            // InternalMenuDsl.g:7282:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
+            // InternalMenuDsl.g:7381:59: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
+            // InternalMenuDsl.g:7382:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundAndedRule()); 
@@ -19992,7 +20277,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // InternalMenuDsl.g:7288:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalMenuDsl.g:7388:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -20004,23 +20289,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7294:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalMenuDsl.g:7295:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7394:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalMenuDsl.g:7395:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalMenuDsl.g:7295:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalMenuDsl.g:7296:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7395:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7396:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,105,FOLLOW_40); if (state.failed) return current;
+            otherlv_0=(Token)match(input,107,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0());
               		
             }
-            // InternalMenuDsl.g:7300:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:7301:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7400:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7401:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:7301:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalMenuDsl.g:7302:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalMenuDsl.g:7401:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7402:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -20076,7 +20361,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // InternalMenuDsl.g:7323:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
+    // InternalMenuDsl.g:7423:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
     public final EObject entryRuleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -20084,8 +20369,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7323:54: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
-            // InternalMenuDsl.g:7324:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
+            // InternalMenuDsl.g:7423:54: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
+            // InternalMenuDsl.g:7424:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundRule()); 
@@ -20116,7 +20401,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // InternalMenuDsl.g:7330:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalMenuDsl.g:7430:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -20128,23 +20413,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7336:2: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalMenuDsl.g:7337:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7436:2: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalMenuDsl.g:7437:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalMenuDsl.g:7337:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalMenuDsl.g:7338:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7437:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7438:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,92,FOLLOW_40); if (state.failed) return current;
+            otherlv_0=(Token)match(input,94,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0());
               		
             }
-            // InternalMenuDsl.g:7342:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:7343:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7442:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7443:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:7343:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalMenuDsl.g:7344:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalMenuDsl.g:7443:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7444:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -20200,7 +20485,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // InternalMenuDsl.g:7365:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
+    // InternalMenuDsl.g:7465:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
     public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -20208,8 +20493,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7365:59: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
-            // InternalMenuDsl.g:7366:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
+            // InternalMenuDsl.g:7465:59: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
+            // InternalMenuDsl.g:7466:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundAndedRule()); 
@@ -20240,7 +20525,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // InternalMenuDsl.g:7372:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalMenuDsl.g:7472:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -20252,23 +20537,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7378:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // InternalMenuDsl.g:7379:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7478:2: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalMenuDsl.g:7479:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // InternalMenuDsl.g:7379:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // InternalMenuDsl.g:7380:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7479:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalMenuDsl.g:7480:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,105,FOLLOW_40); if (state.failed) return current;
+            otherlv_0=(Token)match(input,107,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0());
               		
             }
-            // InternalMenuDsl.g:7384:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // InternalMenuDsl.g:7385:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7484:3: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalMenuDsl.g:7485:4: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // InternalMenuDsl.g:7385:4: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // InternalMenuDsl.g:7386:5: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalMenuDsl.g:7485:4: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalMenuDsl.g:7486:5: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
 
@@ -20324,7 +20609,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // InternalMenuDsl.g:7407:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // InternalMenuDsl.g:7507:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -20332,8 +20617,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7407:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // InternalMenuDsl.g:7408:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // InternalMenuDsl.g:7507:65: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // InternalMenuDsl.g:7508:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
@@ -20364,7 +20649,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // InternalMenuDsl.g:7414:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
+    // InternalMenuDsl.g:7514:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20376,11 +20661,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7420:2: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
-            // InternalMenuDsl.g:7421:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalMenuDsl.g:7520:2: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
+            // InternalMenuDsl.g:7521:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
             {
-            // InternalMenuDsl.g:7421:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
-            // InternalMenuDsl.g:7422:3: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
+            // InternalMenuDsl.g:7521:2: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalMenuDsl.g:7522:3: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
             {
             if ( state.backtracking==0 ) {
 
@@ -20402,14 +20687,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
               			afterParserOrEnumRuleCall();
               		
             }
-            kw=(Token)match(input,76,FOLLOW_99); if (state.failed) return current;
+            kw=(Token)match(input,78,FOLLOW_99); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
               			newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1());
               		
             }
-            kw=(Token)match(input,35,FOLLOW_2); if (state.failed) return current;
+            kw=(Token)match(input,37,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			current.merge(kw);
@@ -20441,7 +20726,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleValidID"
-    // InternalMenuDsl.g:7446:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+    // InternalMenuDsl.g:7546:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
     public final String entryRuleValidID() throws RecognitionException {
         String current = null;
 
@@ -20449,8 +20734,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7446:47: (iv_ruleValidID= ruleValidID EOF )
-            // InternalMenuDsl.g:7447:2: iv_ruleValidID= ruleValidID EOF
+            // InternalMenuDsl.g:7546:47: (iv_ruleValidID= ruleValidID EOF )
+            // InternalMenuDsl.g:7547:2: iv_ruleValidID= ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getValidIDRule()); 
@@ -20481,7 +20766,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleValidID"
-    // InternalMenuDsl.g:7453:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalMenuDsl.g:7553:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20491,8 +20776,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7459:2: (this_ID_0= RULE_ID )
-            // InternalMenuDsl.g:7460:2: this_ID_0= RULE_ID
+            // InternalMenuDsl.g:7559:2: (this_ID_0= RULE_ID )
+            // InternalMenuDsl.g:7560: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 ) {
@@ -20527,7 +20812,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleXImportSection"
-    // InternalMenuDsl.g:7470:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
+    // InternalMenuDsl.g:7570:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
     public final EObject entryRuleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -20535,8 +20820,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7470:55: (iv_ruleXImportSection= ruleXImportSection EOF )
-            // InternalMenuDsl.g:7471:2: iv_ruleXImportSection= ruleXImportSection EOF
+            // InternalMenuDsl.g:7570:55: (iv_ruleXImportSection= ruleXImportSection EOF )
+            // InternalMenuDsl.g:7571:2: iv_ruleXImportSection= ruleXImportSection EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportSectionRule()); 
@@ -20567,7 +20852,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleXImportSection"
-    // InternalMenuDsl.g:7477:1: ruleXImportSection returns [EObject current=null] : ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ ;
+    // InternalMenuDsl.g:7577:1: ruleXImportSection returns [EObject current=null] : ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ ;
     public final EObject ruleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -20578,27 +20863,27 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7483:2: ( ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ )
-            // InternalMenuDsl.g:7484:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
+            // InternalMenuDsl.g:7583:2: ( ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+ )
+            // InternalMenuDsl.g:7584:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
             {
-            // InternalMenuDsl.g:7484:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
-            int cnt136=0;
-            loop136:
+            // InternalMenuDsl.g:7584:2: ( (lv_importDeclarations_0_0= ruleXImportDeclaration ) )+
+            int cnt134=0;
+            loop134:
             do {
-                int alt136=2;
-                int LA136_0 = input.LA(1);
+                int alt134=2;
+                int LA134_0 = input.LA(1);
 
-                if ( (LA136_0==32) ) {
-                    alt136=1;
+                if ( (LA134_0==34) ) {
+                    alt134=1;
                 }
 
 
-                switch (alt136) {
+                switch (alt134) {
             	case 1 :
-            	    // InternalMenuDsl.g:7485:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
+            	    // InternalMenuDsl.g:7585:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
             	    {
-            	    // InternalMenuDsl.g:7485:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
-            	    // InternalMenuDsl.g:7486:4: lv_importDeclarations_0_0= ruleXImportDeclaration
+            	    // InternalMenuDsl.g:7585:3: (lv_importDeclarations_0_0= ruleXImportDeclaration )
+            	    // InternalMenuDsl.g:7586:4: lv_importDeclarations_0_0= ruleXImportDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -20631,13 +20916,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    if ( cnt136 >= 1 ) break loop136;
+            	    if ( cnt134 >= 1 ) break loop134;
             	    if (state.backtracking>0) {state.failed=true; return current;}
                         EarlyExitException eee =
-                            new EarlyExitException(136, input);
+                            new EarlyExitException(134, input);
                         throw eee;
                 }
-                cnt136++;
+                cnt134++;
             } while (true);
 
 
@@ -20662,7 +20947,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedNameInStaticImport"
-    // InternalMenuDsl.g:7506:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
+    // InternalMenuDsl.g:7606:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
     public final String entryRuleQualifiedNameInStaticImport() throws RecognitionException {
         String current = null;
 
@@ -20670,8 +20955,8 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalMenuDsl.g:7506:67: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
-            // InternalMenuDsl.g:7507:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
+            // InternalMenuDsl.g:7606:67: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
+            // InternalMenuDsl.g:7607:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameInStaticImportRule()); 
@@ -20702,7 +20987,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedNameInStaticImport"
-    // InternalMenuDsl.g:7513:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
+    // InternalMenuDsl.g:7613:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20714,30 +20999,30 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
         	enterRule();
 
         try {
-            // InternalMenuDsl.g:7519:2: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
-            // InternalMenuDsl.g:7520:2: (this_ValidID_0= ruleValidID kw= '.' )+
+            // InternalMenuDsl.g:7619:2: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
+            // InternalMenuDsl.g:7620:2: (this_ValidID_0= ruleValidID kw= '.' )+
             {
-            // InternalMenuDsl.g:7520:2: (this_ValidID_0= ruleValidID kw= '.' )+
-            int cnt137=0;
-            loop137:
+            // InternalMenuDsl.g:7620:2: (this_ValidID_0= ruleValidID kw= '.' )+
+            int cnt135=0;
+            loop135:
             do {
-                int alt137=2;
-                int LA137_0 = input.LA(1);
+                int alt135=2;
+                int LA135_0 = input.LA(1);
 
-                if ( (LA137_0==RULE_ID) ) {
-                    int LA137_2 = input.LA(2);
+                if ( (LA135_0==RULE_ID) ) {
+                    int LA135_2 = input.LA(2);
 
-                    if ( (LA137_2==76) ) {
-                        alt137=1;
+                    if ( (LA135_2==78) ) {
+                        alt135=1;
                     }
 
 
                 }
 
 
-                switch (alt137) {
+                switch (alt135) {
             	case 1 :
-            	    // InternalMenuDsl.g:7521:3: this_ValidID_0= ruleValidID kw= '.'
+            	    // InternalMenuDsl.g:7621:3: this_ValidID_0= ruleValidID kw= '.'
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -20759,7 +21044,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	      			afterParserOrEnumRuleCall();
             	      		
             	    }
-            	    kw=(Token)match(input,76,FOLLOW_101); if (state.failed) return current;
+            	    kw=(Token)match(input,78,FOLLOW_101); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      			current.merge(kw);
@@ -20771,13 +21056,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             	    break;
 
             	default :
-            	    if ( cnt137 >= 1 ) break loop137;
+            	    if ( cnt135 >= 1 ) break loop135;
             	    if (state.backtracking>0) {state.failed=true; return current;}
                         EarlyExitException eee =
-                            new EarlyExitException(137, input);
+                            new EarlyExitException(135, input);
                         throw eee;
                 }
-                cnt137++;
+                cnt135++;
             } while (true);
 
 
@@ -20802,10 +21087,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred1_InternalMenuDsl
     public final void synpred1_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:916:5: ( '(' )
-        // InternalMenuDsl.g:916:6: '('
+        // InternalMenuDsl.g:1016:5: ( '(' )
+        // InternalMenuDsl.g:1016:6: '('
         {
-        match(input,39,FOLLOW_2); if (state.failed) return ;
+        match(input,41,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -20813,19 +21098,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred2_InternalMenuDsl
     public final void synpred2_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:925:7: ( ( ( ( ruleValidID ) ) '=' ) )
-        // InternalMenuDsl.g:925:8: ( ( ( ruleValidID ) ) '=' )
+        // InternalMenuDsl.g:1025:7: ( ( ( ( ruleValidID ) ) '=' ) )
+        // InternalMenuDsl.g:1025:8: ( ( ( ruleValidID ) ) '=' )
         {
-        // InternalMenuDsl.g:925:8: ( ( ( ruleValidID ) ) '=' )
-        // InternalMenuDsl.g:926:8: ( ( ruleValidID ) ) '='
+        // InternalMenuDsl.g:1025:8: ( ( ( ruleValidID ) ) '=' )
+        // InternalMenuDsl.g:1026:8: ( ( ruleValidID ) ) '='
         {
-        // InternalMenuDsl.g:926:8: ( ( ruleValidID ) )
-        // InternalMenuDsl.g:927:9: ( ruleValidID )
+        // InternalMenuDsl.g:1026:8: ( ( ruleValidID ) )
+        // InternalMenuDsl.g:1027:9: ( ruleValidID )
         {
-        // InternalMenuDsl.g:927:9: ( ruleValidID )
-        // InternalMenuDsl.g:928:10: ruleValidID
+        // InternalMenuDsl.g:1027:9: ( ruleValidID )
+        // InternalMenuDsl.g:1028:10: ruleValidID
         {
-        pushFollow(FOLLOW_26);
+        pushFollow(FOLLOW_27);
         ruleValidID();
 
         state._fsp--;
@@ -20836,7 +21121,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,42,FOLLOW_2); if (state.failed) return ;
+        match(input,44,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20847,19 +21132,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred5_InternalMenuDsl
     public final void synpred5_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:1105:5: ( ( () '#' '[' ) )
-        // InternalMenuDsl.g:1105:6: ( () '#' '[' )
+        // InternalMenuDsl.g:1205:5: ( ( () '#' '[' ) )
+        // InternalMenuDsl.g:1205:6: ( () '#' '[' )
         {
-        // InternalMenuDsl.g:1105:6: ( () '#' '[' )
-        // InternalMenuDsl.g:1106:6: () '#' '['
+        // InternalMenuDsl.g:1205:6: ( () '#' '[' )
+        // InternalMenuDsl.g:1206:6: () '#' '['
         {
-        // InternalMenuDsl.g:1106:6: ()
-        // InternalMenuDsl.g:1107:6: 
+        // InternalMenuDsl.g:1206:6: ()
+        // InternalMenuDsl.g:1207:6: 
         {
         }
 
-        match(input,43,FOLLOW_28); if (state.failed) return ;
-        match(input,44,FOLLOW_2); if (state.failed) return ;
+        match(input,45,FOLLOW_29); if (state.failed) return ;
+        match(input,46,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20870,19 +21155,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred6_InternalMenuDsl
     public final void synpred6_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:1247:5: ( ( () '#' '[' ) )
-        // InternalMenuDsl.g:1247:6: ( () '#' '[' )
+        // InternalMenuDsl.g:1347:5: ( ( () '#' '[' ) )
+        // InternalMenuDsl.g:1347:6: ( () '#' '[' )
         {
-        // InternalMenuDsl.g:1247:6: ( () '#' '[' )
-        // InternalMenuDsl.g:1248:6: () '#' '['
+        // InternalMenuDsl.g:1347:6: ( () '#' '[' )
+        // InternalMenuDsl.g:1348:6: () '#' '['
         {
-        // InternalMenuDsl.g:1248:6: ()
-        // InternalMenuDsl.g:1249:6: 
+        // InternalMenuDsl.g:1348:6: ()
+        // InternalMenuDsl.g:1349:6: 
         {
         }
 
-        match(input,43,FOLLOW_28); if (state.failed) return ;
-        match(input,44,FOLLOW_2); if (state.failed) return ;
+        match(input,45,FOLLOW_29); if (state.failed) return ;
+        match(input,46,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20893,22 +21178,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred7_InternalMenuDsl
     public final void synpred7_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:1475:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )
-        // InternalMenuDsl.g:1475:7: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalMenuDsl.g:1575:6: ( ( () ( ( ruleOpMultiAssign ) ) ) )
+        // InternalMenuDsl.g:1575:7: ( () ( ( ruleOpMultiAssign ) ) )
         {
-        // InternalMenuDsl.g:1475:7: ( () ( ( ruleOpMultiAssign ) ) )
-        // InternalMenuDsl.g:1476:7: () ( ( ruleOpMultiAssign ) )
+        // InternalMenuDsl.g:1575:7: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalMenuDsl.g:1576:7: () ( ( ruleOpMultiAssign ) )
         {
-        // InternalMenuDsl.g:1476:7: ()
-        // InternalMenuDsl.g:1477:7: 
+        // InternalMenuDsl.g:1576:7: ()
+        // InternalMenuDsl.g:1577:7: 
         {
         }
 
-        // InternalMenuDsl.g:1478:7: ( ( ruleOpMultiAssign ) )
-        // InternalMenuDsl.g:1479:8: ( ruleOpMultiAssign )
+        // InternalMenuDsl.g:1578:7: ( ( ruleOpMultiAssign ) )
+        // InternalMenuDsl.g:1579:8: ( ruleOpMultiAssign )
         {
-        // InternalMenuDsl.g:1479:8: ( ruleOpMultiAssign )
-        // InternalMenuDsl.g:1480:9: ruleOpMultiAssign
+        // InternalMenuDsl.g:1579:8: ( ruleOpMultiAssign )
+        // InternalMenuDsl.g:1580:9: ruleOpMultiAssign
         {
         pushFollow(FOLLOW_2);
         ruleOpMultiAssign();
@@ -20931,22 +21216,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred8_InternalMenuDsl
     public final void synpred8_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:1669:5: ( ( () ( ( ruleOpOr ) ) ) )
-        // InternalMenuDsl.g:1669:6: ( () ( ( ruleOpOr ) ) )
+        // InternalMenuDsl.g:1769:5: ( ( () ( ( ruleOpOr ) ) ) )
+        // InternalMenuDsl.g:1769:6: ( () ( ( ruleOpOr ) ) )
         {
-        // InternalMenuDsl.g:1669:6: ( () ( ( ruleOpOr ) ) )
-        // InternalMenuDsl.g:1670:6: () ( ( ruleOpOr ) )
+        // InternalMenuDsl.g:1769:6: ( () ( ( ruleOpOr ) ) )
+        // InternalMenuDsl.g:1770:6: () ( ( ruleOpOr ) )
         {
-        // InternalMenuDsl.g:1670:6: ()
-        // InternalMenuDsl.g:1671:6: 
+        // InternalMenuDsl.g:1770:6: ()
+        // InternalMenuDsl.g:1771:6: 
         {
         }
 
-        // InternalMenuDsl.g:1672:6: ( ( ruleOpOr ) )
-        // InternalMenuDsl.g:1673:7: ( ruleOpOr )
+        // InternalMenuDsl.g:1772:6: ( ( ruleOpOr ) )
+        // InternalMenuDsl.g:1773:7: ( ruleOpOr )
         {
-        // InternalMenuDsl.g:1673:7: ( ruleOpOr )
-        // InternalMenuDsl.g:1674:8: ruleOpOr
+        // InternalMenuDsl.g:1773:7: ( ruleOpOr )
+        // InternalMenuDsl.g:1774:8: ruleOpOr
         {
         pushFollow(FOLLOW_2);
         ruleOpOr();
@@ -20969,22 +21254,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred9_InternalMenuDsl
     public final void synpred9_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:1776:5: ( ( () ( ( ruleOpAnd ) ) ) )
-        // InternalMenuDsl.g:1776:6: ( () ( ( ruleOpAnd ) ) )
+        // InternalMenuDsl.g:1876:5: ( ( () ( ( ruleOpAnd ) ) ) )
+        // InternalMenuDsl.g:1876:6: ( () ( ( ruleOpAnd ) ) )
         {
-        // InternalMenuDsl.g:1776:6: ( () ( ( ruleOpAnd ) ) )
-        // InternalMenuDsl.g:1777:6: () ( ( ruleOpAnd ) )
+        // InternalMenuDsl.g:1876:6: ( () ( ( ruleOpAnd ) ) )
+        // InternalMenuDsl.g:1877:6: () ( ( ruleOpAnd ) )
         {
-        // InternalMenuDsl.g:1777:6: ()
-        // InternalMenuDsl.g:1778:6: 
+        // InternalMenuDsl.g:1877:6: ()
+        // InternalMenuDsl.g:1878:6: 
         {
         }
 
-        // InternalMenuDsl.g:1779:6: ( ( ruleOpAnd ) )
-        // InternalMenuDsl.g:1780:7: ( ruleOpAnd )
+        // InternalMenuDsl.g:1879:6: ( ( ruleOpAnd ) )
+        // InternalMenuDsl.g:1880:7: ( ruleOpAnd )
         {
-        // InternalMenuDsl.g:1780:7: ( ruleOpAnd )
-        // InternalMenuDsl.g:1781:8: ruleOpAnd
+        // InternalMenuDsl.g:1880:7: ( ruleOpAnd )
+        // InternalMenuDsl.g:1881:8: ruleOpAnd
         {
         pushFollow(FOLLOW_2);
         ruleOpAnd();
@@ -21007,22 +21292,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred10_InternalMenuDsl
     public final void synpred10_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:1883:5: ( ( () ( ( ruleOpEquality ) ) ) )
-        // InternalMenuDsl.g:1883:6: ( () ( ( ruleOpEquality ) ) )
+        // InternalMenuDsl.g:1983:5: ( ( () ( ( ruleOpEquality ) ) ) )
+        // InternalMenuDsl.g:1983:6: ( () ( ( ruleOpEquality ) ) )
         {
-        // InternalMenuDsl.g:1883:6: ( () ( ( ruleOpEquality ) ) )
-        // InternalMenuDsl.g:1884:6: () ( ( ruleOpEquality ) )
+        // InternalMenuDsl.g:1983:6: ( () ( ( ruleOpEquality ) ) )
+        // InternalMenuDsl.g:1984:6: () ( ( ruleOpEquality ) )
         {
-        // InternalMenuDsl.g:1884:6: ()
-        // InternalMenuDsl.g:1885:6: 
+        // InternalMenuDsl.g:1984:6: ()
+        // InternalMenuDsl.g:1985:6: 
         {
         }
 
-        // InternalMenuDsl.g:1886:6: ( ( ruleOpEquality ) )
-        // InternalMenuDsl.g:1887:7: ( ruleOpEquality )
+        // InternalMenuDsl.g:1986:6: ( ( ruleOpEquality ) )
+        // InternalMenuDsl.g:1987:7: ( ruleOpEquality )
         {
-        // InternalMenuDsl.g:1887:7: ( ruleOpEquality )
-        // InternalMenuDsl.g:1888:8: ruleOpEquality
+        // InternalMenuDsl.g:1987:7: ( ruleOpEquality )
+        // InternalMenuDsl.g:1988:8: ruleOpEquality
         {
         pushFollow(FOLLOW_2);
         ruleOpEquality();
@@ -21045,18 +21330,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred11_InternalMenuDsl
     public final void synpred11_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2011:6: ( ( () 'instanceof' ) )
-        // InternalMenuDsl.g:2011:7: ( () 'instanceof' )
+        // InternalMenuDsl.g:2111:6: ( ( () 'instanceof' ) )
+        // InternalMenuDsl.g:2111:7: ( () 'instanceof' )
         {
-        // InternalMenuDsl.g:2011:7: ( () 'instanceof' )
-        // InternalMenuDsl.g:2012:7: () 'instanceof'
+        // InternalMenuDsl.g:2111:7: ( () 'instanceof' )
+        // InternalMenuDsl.g:2112:7: () 'instanceof'
         {
-        // InternalMenuDsl.g:2012:7: ()
-        // InternalMenuDsl.g:2013:7: 
+        // InternalMenuDsl.g:2112:7: ()
+        // InternalMenuDsl.g:2113:7: 
         {
         }
 
-        match(input,60,FOLLOW_2); if (state.failed) return ;
+        match(input,62,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21067,22 +21352,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred12_InternalMenuDsl
     public final void synpred12_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2054:6: ( ( () ( ( ruleOpCompare ) ) ) )
-        // InternalMenuDsl.g:2054:7: ( () ( ( ruleOpCompare ) ) )
+        // InternalMenuDsl.g:2154:6: ( ( () ( ( ruleOpCompare ) ) ) )
+        // InternalMenuDsl.g:2154:7: ( () ( ( ruleOpCompare ) ) )
         {
-        // InternalMenuDsl.g:2054:7: ( () ( ( ruleOpCompare ) ) )
-        // InternalMenuDsl.g:2055:7: () ( ( ruleOpCompare ) )
+        // InternalMenuDsl.g:2154:7: ( () ( ( ruleOpCompare ) ) )
+        // InternalMenuDsl.g:2155:7: () ( ( ruleOpCompare ) )
         {
-        // InternalMenuDsl.g:2055:7: ()
-        // InternalMenuDsl.g:2056:7: 
+        // InternalMenuDsl.g:2155:7: ()
+        // InternalMenuDsl.g:2156:7: 
         {
         }
 
-        // InternalMenuDsl.g:2057:7: ( ( ruleOpCompare ) )
-        // InternalMenuDsl.g:2058:8: ( ruleOpCompare )
+        // InternalMenuDsl.g:2157:7: ( ( ruleOpCompare ) )
+        // InternalMenuDsl.g:2158:8: ( ruleOpCompare )
         {
-        // InternalMenuDsl.g:2058:8: ( ruleOpCompare )
-        // InternalMenuDsl.g:2059:9: ruleOpCompare
+        // InternalMenuDsl.g:2158:8: ( ruleOpCompare )
+        // InternalMenuDsl.g:2159:9: ruleOpCompare
         {
         pushFollow(FOLLOW_2);
         ruleOpCompare();
@@ -21105,22 +21390,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred13_InternalMenuDsl
     public final void synpred13_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2189:5: ( ( () ( ( ruleOpOther ) ) ) )
-        // InternalMenuDsl.g:2189:6: ( () ( ( ruleOpOther ) ) )
+        // InternalMenuDsl.g:2289:5: ( ( () ( ( ruleOpOther ) ) ) )
+        // InternalMenuDsl.g:2289:6: ( () ( ( ruleOpOther ) ) )
         {
-        // InternalMenuDsl.g:2189:6: ( () ( ( ruleOpOther ) ) )
-        // InternalMenuDsl.g:2190:6: () ( ( ruleOpOther ) )
+        // InternalMenuDsl.g:2289:6: ( () ( ( ruleOpOther ) ) )
+        // InternalMenuDsl.g:2290:6: () ( ( ruleOpOther ) )
         {
-        // InternalMenuDsl.g:2190:6: ()
-        // InternalMenuDsl.g:2191:6: 
+        // InternalMenuDsl.g:2290:6: ()
+        // InternalMenuDsl.g:2291:6: 
         {
         }
 
-        // InternalMenuDsl.g:2192:6: ( ( ruleOpOther ) )
-        // InternalMenuDsl.g:2193:7: ( ruleOpOther )
+        // InternalMenuDsl.g:2292:6: ( ( ruleOpOther ) )
+        // InternalMenuDsl.g:2293:7: ( ruleOpOther )
         {
-        // InternalMenuDsl.g:2193:7: ( ruleOpOther )
-        // InternalMenuDsl.g:2194:8: ruleOpOther
+        // InternalMenuDsl.g:2293:7: ( ruleOpOther )
+        // InternalMenuDsl.g:2294:8: ruleOpOther
         {
         pushFollow(FOLLOW_2);
         ruleOpOther();
@@ -21143,14 +21428,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred14_InternalMenuDsl
     public final void synpred14_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2309:6: ( ( '>' '>' ) )
-        // InternalMenuDsl.g:2309:7: ( '>' '>' )
+        // InternalMenuDsl.g:2409:6: ( ( '>' '>' ) )
+        // InternalMenuDsl.g:2409:7: ( '>' '>' )
         {
-        // InternalMenuDsl.g:2309:7: ( '>' '>' )
-        // InternalMenuDsl.g:2310:7: '>' '>'
+        // InternalMenuDsl.g:2409:7: ( '>' '>' )
+        // InternalMenuDsl.g:2410:7: '>' '>'
         {
-        match(input,52,FOLLOW_43); if (state.failed) return ;
-        match(input,52,FOLLOW_2); if (state.failed) return ;
+        match(input,54,FOLLOW_44); if (state.failed) return ;
+        match(input,54,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21161,14 +21446,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred15_InternalMenuDsl
     public final void synpred15_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2344:6: ( ( '<' '<' ) )
-        // InternalMenuDsl.g:2344:7: ( '<' '<' )
+        // InternalMenuDsl.g:2444:6: ( ( '<' '<' ) )
+        // InternalMenuDsl.g:2444:7: ( '<' '<' )
         {
-        // InternalMenuDsl.g:2344:7: ( '<' '<' )
-        // InternalMenuDsl.g:2345:7: '<' '<'
+        // InternalMenuDsl.g:2444:7: ( '<' '<' )
+        // InternalMenuDsl.g:2445:7: '<' '<'
         {
-        match(input,51,FOLLOW_33); if (state.failed) return ;
-        match(input,51,FOLLOW_2); if (state.failed) return ;
+        match(input,53,FOLLOW_34); if (state.failed) return ;
+        match(input,53,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21179,22 +21464,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred16_InternalMenuDsl
     public final void synpred16_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2417:5: ( ( () ( ( ruleOpAdd ) ) ) )
-        // InternalMenuDsl.g:2417:6: ( () ( ( ruleOpAdd ) ) )
+        // InternalMenuDsl.g:2517:5: ( ( () ( ( ruleOpAdd ) ) ) )
+        // InternalMenuDsl.g:2517:6: ( () ( ( ruleOpAdd ) ) )
         {
-        // InternalMenuDsl.g:2417:6: ( () ( ( ruleOpAdd ) ) )
-        // InternalMenuDsl.g:2418:6: () ( ( ruleOpAdd ) )
+        // InternalMenuDsl.g:2517:6: ( () ( ( ruleOpAdd ) ) )
+        // InternalMenuDsl.g:2518:6: () ( ( ruleOpAdd ) )
         {
-        // InternalMenuDsl.g:2418:6: ()
-        // InternalMenuDsl.g:2419:6: 
+        // InternalMenuDsl.g:2518:6: ()
+        // InternalMenuDsl.g:2519:6: 
         {
         }
 
-        // InternalMenuDsl.g:2420:6: ( ( ruleOpAdd ) )
-        // InternalMenuDsl.g:2421:7: ( ruleOpAdd )
+        // InternalMenuDsl.g:2520:6: ( ( ruleOpAdd ) )
+        // InternalMenuDsl.g:2521:7: ( ruleOpAdd )
         {
-        // InternalMenuDsl.g:2421:7: ( ruleOpAdd )
-        // InternalMenuDsl.g:2422:8: ruleOpAdd
+        // InternalMenuDsl.g:2521:7: ( ruleOpAdd )
+        // InternalMenuDsl.g:2522:8: ruleOpAdd
         {
         pushFollow(FOLLOW_2);
         ruleOpAdd();
@@ -21217,22 +21502,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred17_InternalMenuDsl
     public final void synpred17_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2532:5: ( ( () ( ( ruleOpMulti ) ) ) )
-        // InternalMenuDsl.g:2532:6: ( () ( ( ruleOpMulti ) ) )
+        // InternalMenuDsl.g:2632:5: ( ( () ( ( ruleOpMulti ) ) ) )
+        // InternalMenuDsl.g:2632:6: ( () ( ( ruleOpMulti ) ) )
         {
-        // InternalMenuDsl.g:2532:6: ( () ( ( ruleOpMulti ) ) )
-        // InternalMenuDsl.g:2533:6: () ( ( ruleOpMulti ) )
+        // InternalMenuDsl.g:2632:6: ( () ( ( ruleOpMulti ) ) )
+        // InternalMenuDsl.g:2633:6: () ( ( ruleOpMulti ) )
         {
-        // InternalMenuDsl.g:2533:6: ()
-        // InternalMenuDsl.g:2534:6: 
+        // InternalMenuDsl.g:2633:6: ()
+        // InternalMenuDsl.g:2634:6: 
         {
         }
 
-        // InternalMenuDsl.g:2535:6: ( ( ruleOpMulti ) )
-        // InternalMenuDsl.g:2536:7: ( ruleOpMulti )
+        // InternalMenuDsl.g:2635:6: ( ( ruleOpMulti ) )
+        // InternalMenuDsl.g:2636:7: ( ruleOpMulti )
         {
-        // InternalMenuDsl.g:2536:7: ( ruleOpMulti )
-        // InternalMenuDsl.g:2537:8: ruleOpMulti
+        // InternalMenuDsl.g:2636:7: ( ruleOpMulti )
+        // InternalMenuDsl.g:2637:8: ruleOpMulti
         {
         pushFollow(FOLLOW_2);
         ruleOpMulti();
@@ -21255,18 +21540,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred18_InternalMenuDsl
     public final void synpred18_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2767:5: ( ( () 'as' ) )
-        // InternalMenuDsl.g:2767:6: ( () 'as' )
+        // InternalMenuDsl.g:2867:5: ( ( () 'as' ) )
+        // InternalMenuDsl.g:2867:6: ( () 'as' )
         {
-        // InternalMenuDsl.g:2767:6: ( () 'as' )
-        // InternalMenuDsl.g:2768:6: () 'as'
+        // InternalMenuDsl.g:2867:6: ( () 'as' )
+        // InternalMenuDsl.g:2868:6: () 'as'
         {
-        // InternalMenuDsl.g:2768:6: ()
-        // InternalMenuDsl.g:2769:6: 
+        // InternalMenuDsl.g:2868:6: ()
+        // InternalMenuDsl.g:2869:6: 
         {
         }
 
-        match(input,73,FOLLOW_2); if (state.failed) return ;
+        match(input,75,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21277,22 +21562,22 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred19_InternalMenuDsl
     public final void synpred19_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2835:4: ( ( () ( ( ruleOpPostfix ) ) ) )
-        // InternalMenuDsl.g:2835:5: ( () ( ( ruleOpPostfix ) ) )
+        // InternalMenuDsl.g:2935:4: ( ( () ( ( ruleOpPostfix ) ) ) )
+        // InternalMenuDsl.g:2935:5: ( () ( ( ruleOpPostfix ) ) )
         {
-        // InternalMenuDsl.g:2835:5: ( () ( ( ruleOpPostfix ) ) )
-        // InternalMenuDsl.g:2836:5: () ( ( ruleOpPostfix ) )
+        // InternalMenuDsl.g:2935:5: ( () ( ( ruleOpPostfix ) ) )
+        // InternalMenuDsl.g:2936:5: () ( ( ruleOpPostfix ) )
         {
-        // InternalMenuDsl.g:2836:5: ()
-        // InternalMenuDsl.g:2837:5: 
+        // InternalMenuDsl.g:2936:5: ()
+        // InternalMenuDsl.g:2937:5: 
         {
         }
 
-        // InternalMenuDsl.g:2838:5: ( ( ruleOpPostfix ) )
-        // InternalMenuDsl.g:2839:6: ( ruleOpPostfix )
+        // InternalMenuDsl.g:2938:5: ( ( ruleOpPostfix ) )
+        // InternalMenuDsl.g:2939:6: ( ruleOpPostfix )
         {
-        // InternalMenuDsl.g:2839:6: ( ruleOpPostfix )
-        // InternalMenuDsl.g:2840:7: ruleOpPostfix
+        // InternalMenuDsl.g:2939:6: ( ruleOpPostfix )
+        // InternalMenuDsl.g:2940:7: ruleOpPostfix
         {
         pushFollow(FOLLOW_2);
         ruleOpPostfix();
@@ -21315,52 +21600,52 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred20_InternalMenuDsl
     public final void synpred20_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:2931:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-        // InternalMenuDsl.g:2931:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalMenuDsl.g:3031:6: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+        // InternalMenuDsl.g:3031:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
         {
-        // InternalMenuDsl.g:2931:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-        // InternalMenuDsl.g:2932:7: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+        // InternalMenuDsl.g:3031:7: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalMenuDsl.g:3032:7: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
         {
-        // InternalMenuDsl.g:2932:7: ()
-        // InternalMenuDsl.g:2933:7: 
+        // InternalMenuDsl.g:3032:7: ()
+        // InternalMenuDsl.g:3033:7: 
         {
         }
 
-        // InternalMenuDsl.g:2934:7: ( '.' | ( ( '::' ) ) )
-        int alt138=2;
-        int LA138_0 = input.LA(1);
+        // InternalMenuDsl.g:3034:7: ( '.' | ( ( '::' ) ) )
+        int alt136=2;
+        int LA136_0 = input.LA(1);
 
-        if ( (LA138_0==76) ) {
-            alt138=1;
+        if ( (LA136_0==78) ) {
+            alt136=1;
         }
-        else if ( (LA138_0==77) ) {
-            alt138=2;
+        else if ( (LA136_0==79) ) {
+            alt136=2;
         }
         else {
             if (state.backtracking>0) {state.failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("", 138, 0, input);
+                new NoViableAltException("", 136, 0, input);
 
             throw nvae;
         }
-        switch (alt138) {
+        switch (alt136) {
             case 1 :
-                // InternalMenuDsl.g:2935:8: '.'
+                // InternalMenuDsl.g:3035:8: '.'
                 {
-                match(input,76,FOLLOW_50); if (state.failed) return ;
+                match(input,78,FOLLOW_51); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // InternalMenuDsl.g:2937:8: ( ( '::' ) )
+                // InternalMenuDsl.g:3037:8: ( ( '::' ) )
                 {
-                // InternalMenuDsl.g:2937:8: ( ( '::' ) )
-                // InternalMenuDsl.g:2938:9: ( '::' )
+                // InternalMenuDsl.g:3037:8: ( ( '::' ) )
+                // InternalMenuDsl.g:3038:9: ( '::' )
                 {
-                // InternalMenuDsl.g:2938:9: ( '::' )
-                // InternalMenuDsl.g:2939:10: '::'
+                // InternalMenuDsl.g:3038:9: ( '::' )
+                // InternalMenuDsl.g:3039:10: '::'
                 {
-                match(input,77,FOLLOW_50); if (state.failed) return ;
+                match(input,79,FOLLOW_51); if (state.failed) return ;
 
                 }
 
@@ -21373,13 +21658,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalMenuDsl.g:2943:7: ( ( ruleFeatureCallID ) )
-        // InternalMenuDsl.g:2944:8: ( ruleFeatureCallID )
+        // InternalMenuDsl.g:3043:7: ( ( ruleFeatureCallID ) )
+        // InternalMenuDsl.g:3044:8: ( ruleFeatureCallID )
         {
-        // InternalMenuDsl.g:2944:8: ( ruleFeatureCallID )
-        // InternalMenuDsl.g:2945:9: ruleFeatureCallID
+        // InternalMenuDsl.g:3044:8: ( ruleFeatureCallID )
+        // InternalMenuDsl.g:3045:9: ruleFeatureCallID
         {
-        pushFollow(FOLLOW_26);
+        pushFollow(FOLLOW_27);
         ruleFeatureCallID();
 
         state._fsp--;
@@ -21405,61 +21690,61 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred21_InternalMenuDsl
     public final void synpred21_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3028:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
-        // InternalMenuDsl.g:3028:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalMenuDsl.g:3128:6: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
+        // InternalMenuDsl.g:3128:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
         {
-        // InternalMenuDsl.g:3028:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
-        // InternalMenuDsl.g:3029:7: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalMenuDsl.g:3128:7: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalMenuDsl.g:3129:7: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         {
-        // InternalMenuDsl.g:3029:7: ()
-        // InternalMenuDsl.g:3030:7: 
+        // InternalMenuDsl.g:3129:7: ()
+        // InternalMenuDsl.g:3130:7: 
         {
         }
 
-        // InternalMenuDsl.g:3031:7: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
-        int alt139=3;
+        // InternalMenuDsl.g:3131:7: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        int alt137=3;
         switch ( input.LA(1) ) {
-        case 76:
+        case 78:
             {
-            alt139=1;
+            alt137=1;
             }
             break;
-        case 78:
+        case 80:
             {
-            alt139=2;
+            alt137=2;
             }
             break;
-        case 77:
+        case 79:
             {
-            alt139=3;
+            alt137=3;
             }
             break;
         default:
             if (state.backtracking>0) {state.failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("", 139, 0, input);
+                new NoViableAltException("", 137, 0, input);
 
             throw nvae;
         }
 
-        switch (alt139) {
+        switch (alt137) {
             case 1 :
-                // InternalMenuDsl.g:3032:8: '.'
+                // InternalMenuDsl.g:3132:8: '.'
                 {
-                match(input,76,FOLLOW_2); if (state.failed) return ;
+                match(input,78,FOLLOW_2); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // InternalMenuDsl.g:3034:8: ( ( '?.' ) )
+                // InternalMenuDsl.g:3134:8: ( ( '?.' ) )
                 {
-                // InternalMenuDsl.g:3034:8: ( ( '?.' ) )
-                // InternalMenuDsl.g:3035:9: ( '?.' )
+                // InternalMenuDsl.g:3134:8: ( ( '?.' ) )
+                // InternalMenuDsl.g:3135:9: ( '?.' )
                 {
-                // InternalMenuDsl.g:3035:9: ( '?.' )
-                // InternalMenuDsl.g:3036:10: '?.'
+                // InternalMenuDsl.g:3135:9: ( '?.' )
+                // InternalMenuDsl.g:3136:10: '?.'
                 {
-                match(input,78,FOLLOW_2); if (state.failed) return ;
+                match(input,80,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -21470,15 +21755,15 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                 }
                 break;
             case 3 :
-                // InternalMenuDsl.g:3040:8: ( ( '::' ) )
+                // InternalMenuDsl.g:3140:8: ( ( '::' ) )
                 {
-                // InternalMenuDsl.g:3040:8: ( ( '::' ) )
-                // InternalMenuDsl.g:3041:9: ( '::' )
+                // InternalMenuDsl.g:3140:8: ( ( '::' ) )
+                // InternalMenuDsl.g:3141:9: ( '::' )
                 {
-                // InternalMenuDsl.g:3041:9: ( '::' )
-                // InternalMenuDsl.g:3042:10: '::'
+                // InternalMenuDsl.g:3141:9: ( '::' )
+                // InternalMenuDsl.g:3142:10: '::'
                 {
-                match(input,77,FOLLOW_2); if (state.failed) return ;
+                match(input,79,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -21501,13 +21786,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred22_InternalMenuDsl
     public final void synpred22_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3166:7: ( ( '(' ) )
-        // InternalMenuDsl.g:3166:8: ( '(' )
+        // InternalMenuDsl.g:3266:7: ( ( '(' ) )
+        // InternalMenuDsl.g:3266:8: ( '(' )
         {
-        // InternalMenuDsl.g:3166:8: ( '(' )
-        // InternalMenuDsl.g:3167:8: '('
+        // InternalMenuDsl.g:3266:8: ( '(' )
+        // InternalMenuDsl.g:3267:8: '('
         {
-        match(input,39,FOLLOW_2); if (state.failed) return ;
+        match(input,41,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21518,33 +21803,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred23_InternalMenuDsl
     public final void synpred23_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3185:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalMenuDsl.g:3185:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:3285:8: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalMenuDsl.g:3285:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalMenuDsl.g:3185:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalMenuDsl.g:3186:9: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalMenuDsl.g:3285:9: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:3286:9: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalMenuDsl.g:3186:9: ()
-        // InternalMenuDsl.g:3187:9: 
+        // InternalMenuDsl.g:3286:9: ()
+        // InternalMenuDsl.g:3287:9: 
         {
         }
 
-        // InternalMenuDsl.g:3188:9: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt141=2;
-        int LA141_0 = input.LA(1);
+        // InternalMenuDsl.g:3288:9: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt139=2;
+        int LA139_0 = input.LA(1);
 
-        if ( (LA141_0==RULE_ID||LA141_0==39||LA141_0==64) ) {
-            alt141=1;
+        if ( (LA139_0==RULE_ID||LA139_0==41||LA139_0==66) ) {
+            alt139=1;
         }
-        switch (alt141) {
+        switch (alt139) {
             case 1 :
-                // InternalMenuDsl.g:3189:10: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalMenuDsl.g:3289:10: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalMenuDsl.g:3189:10: ( ( ruleJvmFormalParameter ) )
-                // InternalMenuDsl.g:3190:11: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:3289:10: ( ( ruleJvmFormalParameter ) )
+                // InternalMenuDsl.g:3290:11: ( ruleJvmFormalParameter )
                 {
-                // InternalMenuDsl.g:3190:11: ( ruleJvmFormalParameter )
-                // InternalMenuDsl.g:3191:12: ruleJvmFormalParameter
+                // InternalMenuDsl.g:3290:11: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:3291:12: ruleJvmFormalParameter
                 {
                 pushFollow(FOLLOW_61);
                 ruleJvmFormalParameter();
@@ -21557,27 +21842,27 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalMenuDsl.g:3194:10: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop140:
+                // InternalMenuDsl.g:3294:10: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop138:
                 do {
-                    int alt140=2;
-                    int LA140_0 = input.LA(1);
+                    int alt138=2;
+                    int LA138_0 = input.LA(1);
 
-                    if ( (LA140_0==40) ) {
-                        alt140=1;
+                    if ( (LA138_0==42) ) {
+                        alt138=1;
                     }
 
 
-                    switch (alt140) {
+                    switch (alt138) {
                 	case 1 :
-                	    // InternalMenuDsl.g:3195:11: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:3295:11: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,40,FOLLOW_40); if (state.failed) return ;
-                	    // InternalMenuDsl.g:3196:11: ( ( ruleJvmFormalParameter ) )
-                	    // InternalMenuDsl.g:3197:12: ( ruleJvmFormalParameter )
+                	    match(input,42,FOLLOW_41); if (state.failed) return ;
+                	    // InternalMenuDsl.g:3296:11: ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:3297:12: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalMenuDsl.g:3197:12: ( ruleJvmFormalParameter )
-                	    // InternalMenuDsl.g:3198:13: ruleJvmFormalParameter
+                	    // InternalMenuDsl.g:3297:12: ( ruleJvmFormalParameter )
+                	    // InternalMenuDsl.g:3298:13: ruleJvmFormalParameter
                 	    {
                 	    pushFollow(FOLLOW_61);
                 	    ruleJvmFormalParameter();
@@ -21595,7 +21880,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop140;
+                	    break loop138;
                     }
                 } while (true);
 
@@ -21605,13 +21890,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalMenuDsl.g:3203:9: ( ( '|' ) )
-        // InternalMenuDsl.g:3204:10: ( '|' )
+        // InternalMenuDsl.g:3303:9: ( ( '|' ) )
+        // InternalMenuDsl.g:3304:10: ( '|' )
         {
-        // InternalMenuDsl.g:3204:10: ( '|' )
-        // InternalMenuDsl.g:3205:11: '|'
+        // InternalMenuDsl.g:3304:10: ( '|' )
+        // InternalMenuDsl.g:3305:11: '|'
         {
-        match(input,79,FOLLOW_2); if (state.failed) return ;
+        match(input,81,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21628,18 +21913,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred24_InternalMenuDsl
     public final void synpred24_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3282:6: ( ( () '[' ) )
-        // InternalMenuDsl.g:3282:7: ( () '[' )
+        // InternalMenuDsl.g:3382:6: ( ( () '[' ) )
+        // InternalMenuDsl.g:3382:7: ( () '[' )
         {
-        // InternalMenuDsl.g:3282:7: ( () '[' )
-        // InternalMenuDsl.g:3283:7: () '['
+        // InternalMenuDsl.g:3382:7: ( () '[' )
+        // InternalMenuDsl.g:3383:7: () '['
         {
-        // InternalMenuDsl.g:3283:7: ()
-        // InternalMenuDsl.g:3284:7: 
+        // InternalMenuDsl.g:3383:7: ()
+        // InternalMenuDsl.g:3384:7: 
         {
         }
 
-        match(input,44,FOLLOW_2); if (state.failed) return ;
+        match(input,46,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21650,19 +21935,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred25_InternalMenuDsl
     public final void synpred25_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3355:4: ( ( () 'synchronized' '(' ) )
-        // InternalMenuDsl.g:3355:5: ( () 'synchronized' '(' )
+        // InternalMenuDsl.g:3455:4: ( ( () 'synchronized' '(' ) )
+        // InternalMenuDsl.g:3455:5: ( () 'synchronized' '(' )
         {
-        // InternalMenuDsl.g:3355:5: ( () 'synchronized' '(' )
-        // InternalMenuDsl.g:3356:5: () 'synchronized' '('
+        // InternalMenuDsl.g:3455:5: ( () 'synchronized' '(' )
+        // InternalMenuDsl.g:3456:5: () 'synchronized' '('
         {
-        // InternalMenuDsl.g:3356:5: ()
-        // InternalMenuDsl.g:3357:5: 
+        // InternalMenuDsl.g:3456:5: ()
+        // InternalMenuDsl.g:3457:5: 
         {
         }
 
-        match(input,102,FOLLOW_66); if (state.failed) return ;
-        match(input,39,FOLLOW_2); if (state.failed) return ;
+        match(input,104,FOLLOW_66); if (state.failed) return ;
+        match(input,41,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21673,24 +21958,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred26_InternalMenuDsl
     public final void synpred26_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3400:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // InternalMenuDsl.g:3400:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalMenuDsl.g:3500:4: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalMenuDsl.g:3500:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // InternalMenuDsl.g:3400:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // InternalMenuDsl.g:3401:5: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalMenuDsl.g:3500:5: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalMenuDsl.g:3501:5: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // InternalMenuDsl.g:3401:5: ()
-        // InternalMenuDsl.g:3402:5: 
+        // InternalMenuDsl.g:3501:5: ()
+        // InternalMenuDsl.g:3502:5: 
         {
         }
 
-        match(input,86,FOLLOW_66); if (state.failed) return ;
-        match(input,39,FOLLOW_40); if (state.failed) return ;
-        // InternalMenuDsl.g:3405:5: ( ( ruleJvmFormalParameter ) )
-        // InternalMenuDsl.g:3406:6: ( ruleJvmFormalParameter )
+        match(input,88,FOLLOW_66); if (state.failed) return ;
+        match(input,41,FOLLOW_41); if (state.failed) return ;
+        // InternalMenuDsl.g:3505:5: ( ( ruleJvmFormalParameter ) )
+        // InternalMenuDsl.g:3506:6: ( ruleJvmFormalParameter )
         {
-        // InternalMenuDsl.g:3406:6: ( ruleJvmFormalParameter )
-        // InternalMenuDsl.g:3407:7: ruleJvmFormalParameter
+        // InternalMenuDsl.g:3506:6: ( ruleJvmFormalParameter )
+        // InternalMenuDsl.g:3507:7: ruleJvmFormalParameter
         {
         pushFollow(FOLLOW_69);
         ruleJvmFormalParameter();
@@ -21703,7 +21988,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,83,FOLLOW_2); if (state.failed) return ;
+        match(input,85,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21714,18 +21999,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred27_InternalMenuDsl
     public final void synpred27_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3514:4: ( ( () '[' ) )
-        // InternalMenuDsl.g:3514:5: ( () '[' )
+        // InternalMenuDsl.g:3614:4: ( ( () '[' ) )
+        // InternalMenuDsl.g:3614:5: ( () '[' )
         {
-        // InternalMenuDsl.g:3514:5: ( () '[' )
-        // InternalMenuDsl.g:3515:5: () '['
+        // InternalMenuDsl.g:3614:5: ( () '[' )
+        // InternalMenuDsl.g:3615:5: () '['
         {
-        // InternalMenuDsl.g:3515:5: ()
-        // InternalMenuDsl.g:3516:5: 
+        // InternalMenuDsl.g:3615:5: ()
+        // InternalMenuDsl.g:3616:5: 
         {
         }
 
-        match(input,44,FOLLOW_2); if (state.failed) return ;
+        match(input,46,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21736,28 +22021,28 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred29_InternalMenuDsl
     public final void synpred29_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:3819:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalMenuDsl.g:3819:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:3919:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalMenuDsl.g:3919:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalMenuDsl.g:3819:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalMenuDsl.g:3820:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalMenuDsl.g:3919:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:3920:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalMenuDsl.g:3820:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt143=2;
-        int LA143_0 = input.LA(1);
+        // InternalMenuDsl.g:3920:5: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt141=2;
+        int LA141_0 = input.LA(1);
 
-        if ( (LA143_0==RULE_ID||LA143_0==39||LA143_0==64) ) {
-            alt143=1;
+        if ( (LA141_0==RULE_ID||LA141_0==41||LA141_0==66) ) {
+            alt141=1;
         }
-        switch (alt143) {
+        switch (alt141) {
             case 1 :
-                // InternalMenuDsl.g:3821:6: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalMenuDsl.g:3921:6: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalMenuDsl.g:3821:6: ( ( ruleJvmFormalParameter ) )
-                // InternalMenuDsl.g:3822:7: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:3921:6: ( ( ruleJvmFormalParameter ) )
+                // InternalMenuDsl.g:3922:7: ( ruleJvmFormalParameter )
                 {
-                // InternalMenuDsl.g:3822:7: ( ruleJvmFormalParameter )
-                // InternalMenuDsl.g:3823:8: ruleJvmFormalParameter
+                // InternalMenuDsl.g:3922:7: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:3923:8: ruleJvmFormalParameter
                 {
                 pushFollow(FOLLOW_61);
                 ruleJvmFormalParameter();
@@ -21770,27 +22055,27 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalMenuDsl.g:3826:6: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop142:
+                // InternalMenuDsl.g:3926:6: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop140:
                 do {
-                    int alt142=2;
-                    int LA142_0 = input.LA(1);
+                    int alt140=2;
+                    int LA140_0 = input.LA(1);
 
-                    if ( (LA142_0==40) ) {
-                        alt142=1;
+                    if ( (LA140_0==42) ) {
+                        alt140=1;
                     }
 
 
-                    switch (alt142) {
+                    switch (alt140) {
                 	case 1 :
-                	    // InternalMenuDsl.g:3827:7: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:3927:7: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,40,FOLLOW_40); if (state.failed) return ;
-                	    // InternalMenuDsl.g:3828:7: ( ( ruleJvmFormalParameter ) )
-                	    // InternalMenuDsl.g:3829:8: ( ruleJvmFormalParameter )
+                	    match(input,42,FOLLOW_41); if (state.failed) return ;
+                	    // InternalMenuDsl.g:3928:7: ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:3929:8: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalMenuDsl.g:3829:8: ( ruleJvmFormalParameter )
-                	    // InternalMenuDsl.g:3830:9: ruleJvmFormalParameter
+                	    // InternalMenuDsl.g:3929:8: ( ruleJvmFormalParameter )
+                	    // InternalMenuDsl.g:3930:9: ruleJvmFormalParameter
                 	    {
                 	    pushFollow(FOLLOW_61);
                 	    ruleJvmFormalParameter();
@@ -21808,7 +22093,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop142;
+                	    break loop140;
                     }
                 } while (true);
 
@@ -21818,13 +22103,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalMenuDsl.g:3835:5: ( ( '|' ) )
-        // InternalMenuDsl.g:3836:6: ( '|' )
+        // InternalMenuDsl.g:3935:5: ( ( '|' ) )
+        // InternalMenuDsl.g:3936:6: ( '|' )
         {
-        // InternalMenuDsl.g:3836:6: ( '|' )
-        // InternalMenuDsl.g:3837:7: '|'
+        // InternalMenuDsl.g:3936:6: ( '|' )
+        // InternalMenuDsl.g:3937:7: '|'
         {
-        match(input,79,FOLLOW_2); if (state.failed) return ;
+        match(input,81,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21841,10 +22126,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred31_InternalMenuDsl
     public final void synpred31_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:4228:5: ( 'else' )
-        // InternalMenuDsl.g:4228:6: 'else'
+        // InternalMenuDsl.g:4328:5: ( 'else' )
+        // InternalMenuDsl.g:4328:6: 'else'
         {
-        match(input,81,FOLLOW_2); if (state.failed) return ;
+        match(input,83,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -21852,18 +22137,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred32_InternalMenuDsl
     public final void synpred32_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:4287:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // InternalMenuDsl.g:4287:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalMenuDsl.g:4387:6: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalMenuDsl.g:4387:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // InternalMenuDsl.g:4287:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // InternalMenuDsl.g:4288:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalMenuDsl.g:4387:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalMenuDsl.g:4388:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        match(input,39,FOLLOW_40); if (state.failed) return ;
-        // InternalMenuDsl.g:4289:7: ( ( ruleJvmFormalParameter ) )
-        // InternalMenuDsl.g:4290:8: ( ruleJvmFormalParameter )
+        match(input,41,FOLLOW_41); if (state.failed) return ;
+        // InternalMenuDsl.g:4389:7: ( ( ruleJvmFormalParameter ) )
+        // InternalMenuDsl.g:4390:8: ( ruleJvmFormalParameter )
         {
-        // InternalMenuDsl.g:4290:8: ( ruleJvmFormalParameter )
-        // InternalMenuDsl.g:4291:9: ruleJvmFormalParameter
+        // InternalMenuDsl.g:4390:8: ( ruleJvmFormalParameter )
+        // InternalMenuDsl.g:4391:9: ruleJvmFormalParameter
         {
         pushFollow(FOLLOW_69);
         ruleJvmFormalParameter();
@@ -21876,7 +22161,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,83,FOLLOW_2); if (state.failed) return ;
+        match(input,85,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21887,17 +22172,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred33_InternalMenuDsl
     public final void synpred33_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:4354:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // InternalMenuDsl.g:4354:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalMenuDsl.g:4454:6: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalMenuDsl.g:4454:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // InternalMenuDsl.g:4354:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
-        // InternalMenuDsl.g:4355:7: ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalMenuDsl.g:4454:7: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalMenuDsl.g:4455:7: ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // InternalMenuDsl.g:4355:7: ( ( ruleJvmFormalParameter ) )
-        // InternalMenuDsl.g:4356:8: ( ruleJvmFormalParameter )
+        // InternalMenuDsl.g:4455:7: ( ( ruleJvmFormalParameter ) )
+        // InternalMenuDsl.g:4456:8: ( ruleJvmFormalParameter )
         {
-        // InternalMenuDsl.g:4356:8: ( ruleJvmFormalParameter )
-        // InternalMenuDsl.g:4357:9: ruleJvmFormalParameter
+        // InternalMenuDsl.g:4456:8: ( ruleJvmFormalParameter )
+        // InternalMenuDsl.g:4457:9: ruleJvmFormalParameter
         {
         pushFollow(FOLLOW_69);
         ruleJvmFormalParameter();
@@ -21910,7 +22195,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        match(input,83,FOLLOW_2); if (state.failed) return ;
+        match(input,85,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21921,17 +22206,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred35_InternalMenuDsl
     public final void synpred35_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5172:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
-        // InternalMenuDsl.g:5172:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalMenuDsl.g:5272:5: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
+        // InternalMenuDsl.g:5272:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
         {
-        // InternalMenuDsl.g:5172:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
-        // InternalMenuDsl.g:5173:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
+        // InternalMenuDsl.g:5272:6: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalMenuDsl.g:5273:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
         {
-        // InternalMenuDsl.g:5173:6: ( ( ruleJvmTypeReference ) )
-        // InternalMenuDsl.g:5174:7: ( ruleJvmTypeReference )
+        // InternalMenuDsl.g:5273:6: ( ( ruleJvmTypeReference ) )
+        // InternalMenuDsl.g:5274:7: ( ruleJvmTypeReference )
         {
-        // InternalMenuDsl.g:5174:7: ( ruleJvmTypeReference )
-        // InternalMenuDsl.g:5175:8: ruleJvmTypeReference
+        // InternalMenuDsl.g:5274:7: ( ruleJvmTypeReference )
+        // InternalMenuDsl.g:5275:8: ruleJvmTypeReference
         {
         pushFollow(FOLLOW_4);
         ruleJvmTypeReference();
@@ -21944,11 +22229,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalMenuDsl.g:5178:6: ( ( ruleValidID ) )
-        // InternalMenuDsl.g:5179:7: ( ruleValidID )
+        // InternalMenuDsl.g:5278:6: ( ( ruleValidID ) )
+        // InternalMenuDsl.g:5279:7: ( ruleValidID )
         {
-        // InternalMenuDsl.g:5179:7: ( ruleValidID )
-        // InternalMenuDsl.g:5180:8: ruleValidID
+        // InternalMenuDsl.g:5279:7: ( ruleValidID )
+        // InternalMenuDsl.g:5280:8: ruleValidID
         {
         pushFollow(FOLLOW_2);
         ruleValidID();
@@ -21971,13 +22256,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred36_InternalMenuDsl
     public final void synpred36_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5484:5: ( ( '(' ) )
-        // InternalMenuDsl.g:5484:6: ( '(' )
+        // InternalMenuDsl.g:5584:5: ( ( '(' ) )
+        // InternalMenuDsl.g:5584:6: ( '(' )
         {
-        // InternalMenuDsl.g:5484:6: ( '(' )
-        // InternalMenuDsl.g:5485:6: '('
+        // InternalMenuDsl.g:5584:6: ( '(' )
+        // InternalMenuDsl.g:5585:6: '('
         {
-        match(input,39,FOLLOW_2); if (state.failed) return ;
+        match(input,41,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21988,33 +22273,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred37_InternalMenuDsl
     public final void synpred37_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5503:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalMenuDsl.g:5503:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:5603:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalMenuDsl.g:5603:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalMenuDsl.g:5503:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalMenuDsl.g:5504:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalMenuDsl.g:5603:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:5604:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalMenuDsl.g:5504:7: ()
-        // InternalMenuDsl.g:5505:7: 
+        // InternalMenuDsl.g:5604:7: ()
+        // InternalMenuDsl.g:5605:7: 
         {
         }
 
-        // InternalMenuDsl.g:5506:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt147=2;
-        int LA147_0 = input.LA(1);
+        // InternalMenuDsl.g:5606:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt145=2;
+        int LA145_0 = input.LA(1);
 
-        if ( (LA147_0==RULE_ID||LA147_0==39||LA147_0==64) ) {
-            alt147=1;
+        if ( (LA145_0==RULE_ID||LA145_0==41||LA145_0==66) ) {
+            alt145=1;
         }
-        switch (alt147) {
+        switch (alt145) {
             case 1 :
-                // InternalMenuDsl.g:5507:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalMenuDsl.g:5607:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalMenuDsl.g:5507:8: ( ( ruleJvmFormalParameter ) )
-                // InternalMenuDsl.g:5508:9: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:5607:8: ( ( ruleJvmFormalParameter ) )
+                // InternalMenuDsl.g:5608:9: ( ruleJvmFormalParameter )
                 {
-                // InternalMenuDsl.g:5508:9: ( ruleJvmFormalParameter )
-                // InternalMenuDsl.g:5509:10: ruleJvmFormalParameter
+                // InternalMenuDsl.g:5608:9: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:5609:10: ruleJvmFormalParameter
                 {
                 pushFollow(FOLLOW_61);
                 ruleJvmFormalParameter();
@@ -22027,27 +22312,27 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalMenuDsl.g:5512:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop146:
+                // InternalMenuDsl.g:5612:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop144:
                 do {
-                    int alt146=2;
-                    int LA146_0 = input.LA(1);
+                    int alt144=2;
+                    int LA144_0 = input.LA(1);
 
-                    if ( (LA146_0==40) ) {
-                        alt146=1;
+                    if ( (LA144_0==42) ) {
+                        alt144=1;
                     }
 
 
-                    switch (alt146) {
+                    switch (alt144) {
                 	case 1 :
-                	    // InternalMenuDsl.g:5513:9: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:5613:9: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,40,FOLLOW_40); if (state.failed) return ;
-                	    // InternalMenuDsl.g:5514:9: ( ( ruleJvmFormalParameter ) )
-                	    // InternalMenuDsl.g:5515:10: ( ruleJvmFormalParameter )
+                	    match(input,42,FOLLOW_41); if (state.failed) return ;
+                	    // InternalMenuDsl.g:5614:9: ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:5615:10: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalMenuDsl.g:5515:10: ( ruleJvmFormalParameter )
-                	    // InternalMenuDsl.g:5516:11: ruleJvmFormalParameter
+                	    // InternalMenuDsl.g:5615:10: ( ruleJvmFormalParameter )
+                	    // InternalMenuDsl.g:5616:11: ruleJvmFormalParameter
                 	    {
                 	    pushFollow(FOLLOW_61);
                 	    ruleJvmFormalParameter();
@@ -22065,7 +22350,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop146;
+                	    break loop144;
                     }
                 } while (true);
 
@@ -22075,13 +22360,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalMenuDsl.g:5521:7: ( ( '|' ) )
-        // InternalMenuDsl.g:5522:8: ( '|' )
+        // InternalMenuDsl.g:5621:7: ( ( '|' ) )
+        // InternalMenuDsl.g:5622:8: ( '|' )
         {
-        // InternalMenuDsl.g:5522:8: ( '|' )
-        // InternalMenuDsl.g:5523:9: '|'
+        // InternalMenuDsl.g:5622:8: ( '|' )
+        // InternalMenuDsl.g:5623:9: '|'
         {
-        match(input,79,FOLLOW_2); if (state.failed) return ;
+        match(input,81,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -22098,18 +22383,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred38_InternalMenuDsl
     public final void synpred38_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5600:4: ( ( () '[' ) )
-        // InternalMenuDsl.g:5600:5: ( () '[' )
+        // InternalMenuDsl.g:5700:4: ( ( () '[' ) )
+        // InternalMenuDsl.g:5700:5: ( () '[' )
         {
-        // InternalMenuDsl.g:5600:5: ( () '[' )
-        // InternalMenuDsl.g:5601:5: () '['
+        // InternalMenuDsl.g:5700:5: ( () '[' )
+        // InternalMenuDsl.g:5701:5: () '['
         {
-        // InternalMenuDsl.g:5601:5: ()
-        // InternalMenuDsl.g:5602:5: 
+        // InternalMenuDsl.g:5701:5: ()
+        // InternalMenuDsl.g:5702:5: 
         {
         }
 
-        match(input,44,FOLLOW_2); if (state.failed) return ;
+        match(input,46,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -22120,10 +22405,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred39_InternalMenuDsl
     public final void synpred39_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5760:5: ( '<' )
-        // InternalMenuDsl.g:5760:6: '<'
+        // InternalMenuDsl.g:5860:5: ( '<' )
+        // InternalMenuDsl.g:5860:6: '<'
         {
-        match(input,51,FOLLOW_2); if (state.failed) return ;
+        match(input,53,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -22131,13 +22416,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred40_InternalMenuDsl
     public final void synpred40_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5817:5: ( ( '(' ) )
-        // InternalMenuDsl.g:5817:6: ( '(' )
+        // InternalMenuDsl.g:5917:5: ( ( '(' ) )
+        // InternalMenuDsl.g:5917:6: ( '(' )
         {
-        // InternalMenuDsl.g:5817:6: ( '(' )
-        // InternalMenuDsl.g:5818:6: '('
+        // InternalMenuDsl.g:5917:6: ( '(' )
+        // InternalMenuDsl.g:5918:6: '('
         {
-        match(input,39,FOLLOW_2); if (state.failed) return ;
+        match(input,41,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -22148,33 +22433,33 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred41_InternalMenuDsl
     public final void synpred41_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5836:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // InternalMenuDsl.g:5836:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:5936:6: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalMenuDsl.g:5936:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // InternalMenuDsl.g:5836:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // InternalMenuDsl.g:5837:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalMenuDsl.g:5936:7: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalMenuDsl.g:5937:7: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // InternalMenuDsl.g:5837:7: ()
-        // InternalMenuDsl.g:5838:7: 
+        // InternalMenuDsl.g:5937:7: ()
+        // InternalMenuDsl.g:5938:7: 
         {
         }
 
-        // InternalMenuDsl.g:5839:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt149=2;
-        int LA149_0 = input.LA(1);
+        // InternalMenuDsl.g:5939:7: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt147=2;
+        int LA147_0 = input.LA(1);
 
-        if ( (LA149_0==RULE_ID||LA149_0==39||LA149_0==64) ) {
-            alt149=1;
+        if ( (LA147_0==RULE_ID||LA147_0==41||LA147_0==66) ) {
+            alt147=1;
         }
-        switch (alt149) {
+        switch (alt147) {
             case 1 :
-                // InternalMenuDsl.g:5840:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalMenuDsl.g:5940:8: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // InternalMenuDsl.g:5840:8: ( ( ruleJvmFormalParameter ) )
-                // InternalMenuDsl.g:5841:9: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:5940:8: ( ( ruleJvmFormalParameter ) )
+                // InternalMenuDsl.g:5941:9: ( ruleJvmFormalParameter )
                 {
-                // InternalMenuDsl.g:5841:9: ( ruleJvmFormalParameter )
-                // InternalMenuDsl.g:5842:10: ruleJvmFormalParameter
+                // InternalMenuDsl.g:5941:9: ( ruleJvmFormalParameter )
+                // InternalMenuDsl.g:5942:10: ruleJvmFormalParameter
                 {
                 pushFollow(FOLLOW_61);
                 ruleJvmFormalParameter();
@@ -22187,27 +22472,27 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
                 }
 
-                // InternalMenuDsl.g:5845:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop148:
+                // InternalMenuDsl.g:5945:8: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop146:
                 do {
-                    int alt148=2;
-                    int LA148_0 = input.LA(1);
+                    int alt146=2;
+                    int LA146_0 = input.LA(1);
 
-                    if ( (LA148_0==40) ) {
-                        alt148=1;
+                    if ( (LA146_0==42) ) {
+                        alt146=1;
                     }
 
 
-                    switch (alt148) {
+                    switch (alt146) {
                 	case 1 :
-                	    // InternalMenuDsl.g:5846:9: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:5946:9: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,40,FOLLOW_40); if (state.failed) return ;
-                	    // InternalMenuDsl.g:5847:9: ( ( ruleJvmFormalParameter ) )
-                	    // InternalMenuDsl.g:5848:10: ( ruleJvmFormalParameter )
+                	    match(input,42,FOLLOW_41); if (state.failed) return ;
+                	    // InternalMenuDsl.g:5947:9: ( ( ruleJvmFormalParameter ) )
+                	    // InternalMenuDsl.g:5948:10: ( ruleJvmFormalParameter )
                 	    {
-                	    // InternalMenuDsl.g:5848:10: ( ruleJvmFormalParameter )
-                	    // InternalMenuDsl.g:5849:11: ruleJvmFormalParameter
+                	    // InternalMenuDsl.g:5948:10: ( ruleJvmFormalParameter )
+                	    // InternalMenuDsl.g:5949:11: ruleJvmFormalParameter
                 	    {
                 	    pushFollow(FOLLOW_61);
                 	    ruleJvmFormalParameter();
@@ -22225,7 +22510,7 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                 	    break;
 
                 	default :
-                	    break loop148;
+                	    break loop146;
                     }
                 } while (true);
 
@@ -22235,13 +22520,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
         }
 
-        // InternalMenuDsl.g:5854:7: ( ( '|' ) )
-        // InternalMenuDsl.g:5855:8: ( '|' )
+        // InternalMenuDsl.g:5954:7: ( ( '|' ) )
+        // InternalMenuDsl.g:5955:8: ( '|' )
         {
-        // InternalMenuDsl.g:5855:8: ( '|' )
-        // InternalMenuDsl.g:5856:9: '|'
+        // InternalMenuDsl.g:5955:8: ( '|' )
+        // InternalMenuDsl.g:5956:9: '|'
         {
-        match(input,79,FOLLOW_2); if (state.failed) return ;
+        match(input,81,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -22258,18 +22543,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred42_InternalMenuDsl
     public final void synpred42_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:5933:4: ( ( () '[' ) )
-        // InternalMenuDsl.g:5933:5: ( () '[' )
+        // InternalMenuDsl.g:6033:4: ( ( () '[' ) )
+        // InternalMenuDsl.g:6033:5: ( () '[' )
         {
-        // InternalMenuDsl.g:5933:5: ( () '[' )
-        // InternalMenuDsl.g:5934:5: () '['
+        // InternalMenuDsl.g:6033:5: ( () '[' )
+        // InternalMenuDsl.g:6034:5: () '['
         {
-        // InternalMenuDsl.g:5934:5: ()
-        // InternalMenuDsl.g:5935:5: 
+        // InternalMenuDsl.g:6034:5: ()
+        // InternalMenuDsl.g:6035:5: 
         {
         }
 
-        match(input,44,FOLLOW_2); if (state.failed) return ;
+        match(input,46,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -22280,10 +22565,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred43_InternalMenuDsl
     public final void synpred43_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6276: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 )
+        // InternalMenuDsl.g:6376: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 )
         // InternalMenuDsl.g:
         {
-        if ( (input.LA(1)>=RULE_STRING && input.LA(1)<=RULE_DECIMAL)||input.LA(1)==14||(input.LA(1)>=32 && input.LA(1)<=34)||input.LA(1)==39||(input.LA(1)>=43 && input.LA(1)<=44)||input.LA(1)==51||(input.LA(1)>=67 && input.LA(1)<=68)||input.LA(1)==72||input.LA(1)==80||input.LA(1)==82||(input.LA(1)>=86 && input.LA(1)<=88)||(input.LA(1)>=91 && input.LA(1)<=100)||input.LA(1)==102 ) {
+        if ( (input.LA(1)>=RULE_STRING && input.LA(1)<=RULE_DECIMAL)||input.LA(1)==26||(input.LA(1)>=34 && input.LA(1)<=36)||input.LA(1)==41||(input.LA(1)>=45 && input.LA(1)<=46)||input.LA(1)==53||(input.LA(1)>=69 && input.LA(1)<=70)||input.LA(1)==74||input.LA(1)==82||input.LA(1)==84||(input.LA(1)>=88 && input.LA(1)<=90)||(input.LA(1)>=93 && input.LA(1)<=102)||input.LA(1)==104 ) {
             input.consume();
             state.errorRecovery=false;state.failed=false;
         }
@@ -22300,10 +22585,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred44_InternalMenuDsl
     public final void synpred44_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6347:6: ( 'catch' )
-        // InternalMenuDsl.g:6347:7: 'catch'
+        // InternalMenuDsl.g:6447:6: ( 'catch' )
+        // InternalMenuDsl.g:6447:7: 'catch'
         {
-        match(input,103,FOLLOW_2); if (state.failed) return ;
+        match(input,105,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -22311,10 +22596,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred45_InternalMenuDsl
     public final void synpred45_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6368:7: ( 'finally' )
-        // InternalMenuDsl.g:6368:8: 'finally'
+        // InternalMenuDsl.g:6468:7: ( 'finally' )
+        // InternalMenuDsl.g:6468:8: 'finally'
         {
-        match(input,101,FOLLOW_2); if (state.failed) return ;
+        match(input,103,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -22322,10 +22607,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred48_InternalMenuDsl
     public final void synpred48_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6612:5: ( '.' )
-        // InternalMenuDsl.g:6612:6: '.'
+        // InternalMenuDsl.g:6712:5: ( '.' )
+        // InternalMenuDsl.g:6712:6: '.'
         {
-        match(input,76,FOLLOW_2); if (state.failed) return ;
+        match(input,78,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -22333,14 +22618,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred49_InternalMenuDsl
     public final void synpred49_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6738:5: ( ( () ruleArrayBrackets ) )
-        // InternalMenuDsl.g:6738:6: ( () ruleArrayBrackets )
+        // InternalMenuDsl.g:6838:5: ( ( () ruleArrayBrackets ) )
+        // InternalMenuDsl.g:6838:6: ( () ruleArrayBrackets )
         {
-        // InternalMenuDsl.g:6738:6: ( () ruleArrayBrackets )
-        // InternalMenuDsl.g:6739:6: () ruleArrayBrackets
+        // InternalMenuDsl.g:6838:6: ( () ruleArrayBrackets )
+        // InternalMenuDsl.g:6839:6: () ruleArrayBrackets
         {
-        // InternalMenuDsl.g:6739:6: ()
-        // InternalMenuDsl.g:6740:6: 
+        // InternalMenuDsl.g:6839:6: ()
+        // InternalMenuDsl.g:6840:6: 
         {
         }
 
@@ -22359,10 +22644,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred50_InternalMenuDsl
     public final void synpred50_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6935:5: ( '<' )
-        // InternalMenuDsl.g:6935:6: '<'
+        // InternalMenuDsl.g:7035:5: ( '<' )
+        // InternalMenuDsl.g:7035:6: '<'
         {
-        match(input,51,FOLLOW_2); if (state.failed) return ;
+        match(input,53,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -22370,18 +22655,18 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred51_InternalMenuDsl
     public final void synpred51_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:6991:6: ( ( () '.' ) )
-        // InternalMenuDsl.g:6991:7: ( () '.' )
+        // InternalMenuDsl.g:7091:6: ( ( () '.' ) )
+        // InternalMenuDsl.g:7091:7: ( () '.' )
         {
-        // InternalMenuDsl.g:6991:7: ( () '.' )
-        // InternalMenuDsl.g:6992:7: () '.'
+        // InternalMenuDsl.g:7091:7: ( () '.' )
+        // InternalMenuDsl.g:7092:7: () '.'
         {
-        // InternalMenuDsl.g:6992:7: ()
-        // InternalMenuDsl.g:6993:7: 
+        // InternalMenuDsl.g:7092:7: ()
+        // InternalMenuDsl.g:7093:7: 
         {
         }
 
-        match(input,76,FOLLOW_2); if (state.failed) return ;
+        match(input,78,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -22392,10 +22677,10 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred52_InternalMenuDsl
     public final void synpred52_InternalMenuDsl_fragment() throws RecognitionException {   
-        // InternalMenuDsl.g:7029:7: ( '<' )
-        // InternalMenuDsl.g:7029:8: '<'
+        // InternalMenuDsl.g:7129:7: ( '<' )
+        // InternalMenuDsl.g:7129:8: '<'
         {
-        match(input,51,FOLLOW_2); if (state.failed) return ;
+        match(input,53,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23035,44 +23320,44 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     }
 
 
-    protected DFA17 dfa17 = new DFA17(this);
-    protected DFA20 dfa20 = new DFA20(this);
-    protected DFA26 dfa26 = new DFA26(this);
+    protected DFA15 dfa15 = new DFA15(this);
+    protected DFA18 dfa18 = new DFA18(this);
+    protected DFA24 dfa24 = new DFA24(this);
+    protected DFA27 dfa27 = new DFA27(this);
     protected DFA29 dfa29 = new DFA29(this);
-    protected DFA31 dfa31 = new DFA31(this);
-    protected DFA41 dfa41 = new DFA41(this);
-    protected DFA44 dfa44 = new DFA44(this);
-    protected DFA60 dfa60 = new DFA60(this);
+    protected DFA39 dfa39 = new DFA39(this);
+    protected DFA42 dfa42 = new DFA42(this);
+    protected DFA58 dfa58 = new DFA58(this);
+    protected DFA57 dfa57 = new DFA57(this);
     protected DFA59 dfa59 = new DFA59(this);
     protected DFA61 dfa61 = new DFA61(this);
-    protected DFA63 dfa63 = new DFA63(this);
-    protected DFA72 dfa72 = new DFA72(this);
-    protected DFA79 dfa79 = new DFA79(this);
-    protected DFA78 dfa78 = new DFA78(this);
-    protected DFA101 dfa101 = new DFA101(this);
+    protected DFA70 dfa70 = new DFA70(this);
+    protected DFA77 dfa77 = new DFA77(this);
+    protected DFA76 dfa76 = new DFA76(this);
+    protected DFA99 dfa99 = new DFA99(this);
+    protected DFA98 dfa98 = new DFA98(this);
     protected DFA100 dfa100 = new DFA100(this);
-    protected DFA102 dfa102 = new DFA102(this);
+    protected DFA104 dfa104 = new DFA104(this);
+    protected DFA107 dfa107 = new DFA107(this);
     protected DFA106 dfa106 = new DFA106(this);
-    protected DFA109 dfa109 = new DFA109(this);
     protected DFA108 dfa108 = new DFA108(this);
-    protected DFA110 dfa110 = new DFA110(this);
-    protected DFA113 dfa113 = new DFA113(this);
-    protected DFA131 dfa131 = new DFA131(this);
+    protected DFA111 dfa111 = new DFA111(this);
     protected DFA129 dfa129 = new DFA129(this);
+    protected DFA127 dfa127 = new DFA127(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\5\1\uffff\1\15\1\uffff\1\5\1\uffff\1\15\1\uffff";
-    static final String dfa_4s = "\1\44\1\uffff\1\114\1\uffff\1\43\1\uffff\1\114\1\uffff";
+    static final String dfa_4s = "\1\46\1\uffff\1\116\1\uffff\1\45\1\uffff\1\116\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\33\uffff\1\1\2\uffff\1\3",
+            "\1\2\35\uffff\1\1\2\uffff\1\3",
             "",
-            "\1\5\22\uffff\1\5\4\uffff\1\5\46\uffff\1\4",
+            "\1\5\24\uffff\1\5\4\uffff\1\5\46\uffff\1\4",
             "",
-            "\1\6\35\uffff\1\7",
+            "\1\6\37\uffff\1\7",
             "",
-            "\1\5\22\uffff\1\5\4\uffff\1\5\46\uffff\1\4",
+            "\1\5\24\uffff\1\5\4\uffff\1\5\46\uffff\1\4",
             ""
     };
 
@@ -23084,11 +23369,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
     static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
-    class DFA17 extends DFA {
+    class DFA15 extends DFA {
 
-        public DFA17(BaseRecognizer recognizer) {
+        public DFA15(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 17;
+            this.decisionNumber = 15;
             this.eot = dfa_1;
             this.eof = dfa_2;
             this.min = dfa_3;
@@ -23098,16 +23383,16 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_7;
         }
         public String getDescription() {
-            return "705: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 "805: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\146\1\0\42\uffff";
+    static final String dfa_10s = "\1\150\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\2\1\1\3\2\5\uffff\1\2\21\uffff\3\2\3\uffff\2\2\1\uffff\1\42\1\uffff\2\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
+            "\1\2\1\1\3\2\21\uffff\1\2\7\uffff\3\2\3\uffff\2\2\1\uffff\1\42\1\uffff\2\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -23152,11 +23437,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
     static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
-    class DFA20 extends DFA {
+    class DFA18 extends DFA {
 
-        public DFA20(BaseRecognizer recognizer) {
+        public DFA18(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 20;
+            this.decisionNumber = 18;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_9;
@@ -23166,17 +23451,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_13;
         }
         public String getDescription() {
-            return "922:4: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?";
+            return "1022: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 LA20_1 = input.LA(1);
+                        int LA18_1 = input.LA(1);
 
                          
-                        int index20_1 = input.index();
+                        int index18_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred2_InternalMenuDsl()) ) {s = 35;}
@@ -23184,24 +23469,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index20_1);
+                        input.seek(index18_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 20, _s, input);
+                new NoViableAltException(getDescription(), 18, _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\146\1\0\41\uffff";
+    static final String dfa_16s = "\1\150\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 = {
-            "\5\2\5\uffff\1\2\21\uffff\3\2\3\uffff\2\2\3\uffff\1\1\1\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
+            "\5\2\21\uffff\1\2\7\uffff\3\2\3\uffff\2\2\3\uffff\1\1\1\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -23245,11 +23530,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
     static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
-    class DFA26 extends DFA {
+    class DFA24 extends DFA {
 
-        public DFA26(BaseRecognizer recognizer) {
+        public DFA24(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 26;
+            this.decisionNumber = 24;
             this.eot = dfa_14;
             this.eof = dfa_14;
             this.min = dfa_15;
@@ -23259,17 +23544,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_19;
         }
         public String getDescription() {
-            return "1102: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 "1202: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 LA26_1 = input.LA(1);
+                        int LA24_1 = input.LA(1);
 
                          
-                        int index26_1 = input.index();
+                        int index24_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred5_InternalMenuDsl()) ) {s = 34;}
@@ -23277,23 +23562,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index26_1);
+                        input.seek(index24_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 26, _s, input);
+                new NoViableAltException(getDescription(), 24, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA29 extends DFA {
+    class DFA27 extends DFA {
 
-        public DFA29(BaseRecognizer recognizer) {
+        public DFA27(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 29;
+            this.decisionNumber = 27;
             this.eot = dfa_14;
             this.eof = dfa_14;
             this.min = dfa_15;
@@ -23303,17 +23588,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_19;
         }
         public String getDescription() {
-            return "1244:2: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )";
+            return "1344: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 LA29_1 = input.LA(1);
+                        int LA27_1 = input.LA(1);
 
                          
-                        int index29_1 = input.index();
+                        int index27_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6_InternalMenuDsl()) ) {s = 34;}
@@ -23321,13 +23606,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index29_1);
+                        input.seek(index27_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 29, _s, input);
+                new NoViableAltException(getDescription(), 27, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -23335,11 +23620,11 @@ public class InternalMenuDslParser 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\147\7\0\2\uffff";
+    static final String dfa_23s = "\1\151\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_25s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\2\uffff}>";
     static final String[] dfa_26s = {
-            "\5\10\5\uffff\1\10\6\uffff\1\10\12\uffff\4\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\32\10\1\uffff\30\10",
+            "\5\10\21\uffff\2\10\6\uffff\4\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\32\10\1\uffff\30\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -23359,11 +23644,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_25 = DFA.unpackEncodedString(dfa_25s);
     static final short[][] dfa_26 = unpackEncodedStringArray(dfa_26s);
 
-    class DFA31 extends DFA {
+    class DFA29 extends DFA {
 
-        public DFA31(BaseRecognizer recognizer) {
+        public DFA29(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 31;
+            this.decisionNumber = 29;
             this.eot = dfa_20;
             this.eof = dfa_21;
             this.min = dfa_22;
@@ -23373,17 +23658,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_26;
         }
         public String getDescription() {
-            return "1473:4: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
+            return "1573: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 LA31_6 = input.LA(1);
+                        int LA29_1 = input.LA(1);
 
                          
-                        int index31_6 = input.index();
+                        int index29_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalMenuDsl()) ) {s = 9;}
@@ -23391,14 +23676,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index31_6);
+                        input.seek(index29_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA31_1 = input.LA(1);
+                        int LA29_2 = input.LA(1);
 
                          
-                        int index31_1 = input.index();
+                        int index29_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalMenuDsl()) ) {s = 9;}
@@ -23406,14 +23691,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index31_1);
+                        input.seek(index29_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA31_2 = input.LA(1);
+                        int LA29_3 = input.LA(1);
 
                          
-                        int index31_2 = input.index();
+                        int index29_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalMenuDsl()) ) {s = 9;}
@@ -23421,14 +23706,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index31_2);
+                        input.seek(index29_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA31_3 = input.LA(1);
+                        int LA29_4 = input.LA(1);
 
                          
-                        int index31_3 = input.index();
+                        int index29_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalMenuDsl()) ) {s = 9;}
@@ -23436,14 +23721,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index31_3);
+                        input.seek(index29_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA31_4 = input.LA(1);
+                        int LA29_5 = input.LA(1);
 
                          
-                        int index31_4 = input.index();
+                        int index29_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalMenuDsl()) ) {s = 9;}
@@ -23451,14 +23736,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index31_4);
+                        input.seek(index29_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA31_5 = input.LA(1);
+                        int LA29_6 = input.LA(1);
 
                          
-                        int index31_5 = input.index();
+                        int index29_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalMenuDsl()) ) {s = 9;}
@@ -23466,14 +23751,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index31_5);
+                        input.seek(index29_6);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA31_7 = input.LA(1);
+                        int LA29_7 = input.LA(1);
 
                          
-                        int index31_7 = input.index();
+                        int index29_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7_InternalMenuDsl()) ) {s = 9;}
@@ -23481,13 +23766,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index31_7);
+                        input.seek(index29_7);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 31, _s, input);
+                new NoViableAltException(getDescription(), 29, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -23495,11 +23780,11 @@ public class InternalMenuDslParser 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\147\1\uffff\10\0\1\uffff";
+    static final String dfa_30s = "\1\151\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\5\1\1\1\6\1\7\1\4\1\0\1\2\1\3\1\uffff}>";
+    static final String dfa_32s = "\2\uffff\1\3\1\4\1\5\1\6\1\2\1\7\1\0\1\1\1\uffff}>";
     static final String[] dfa_33s = {
-            "\5\1\5\uffff\1\1\6\uffff\1\1\12\uffff\4\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\14\1\1\uffff\30\1",
+            "\5\1\21\uffff\2\1\6\uffff\4\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\14\1\1\uffff\30\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -23520,11 +23805,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_32 = DFA.unpackEncodedString(dfa_32s);
     static final short[][] dfa_33 = unpackEncodedStringArray(dfa_33s);
 
-    class DFA41 extends DFA {
+    class DFA39 extends DFA {
 
-        public DFA41(BaseRecognizer recognizer) {
+        public DFA39(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 41;
+            this.decisionNumber = 39;
             this.eot = dfa_27;
             this.eof = dfa_28;
             this.min = dfa_29;
@@ -23534,17 +23819,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_33;
         }
         public String getDescription() {
-            return "()* loopback of 2187:3: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
+            return "()* loopback of 2287: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 LA41_7 = input.LA(1);
+                        int LA39_8 = input.LA(1);
 
                          
-                        int index41_7 = input.index();
+                        int index39_8 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23552,14 +23837,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_7);
+                        input.seek(index39_8);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA41_3 = input.LA(1);
+                        int LA39_9 = input.LA(1);
 
                          
-                        int index41_3 = input.index();
+                        int index39_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23567,14 +23852,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_3);
+                        input.seek(index39_9);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA41_8 = input.LA(1);
+                        int LA39_6 = input.LA(1);
 
                          
-                        int index41_8 = input.index();
+                        int index39_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23582,14 +23867,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_8);
+                        input.seek(index39_6);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA41_9 = input.LA(1);
+                        int LA39_2 = input.LA(1);
 
                          
-                        int index41_9 = input.index();
+                        int index39_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23597,14 +23882,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_9);
+                        input.seek(index39_2);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA41_6 = input.LA(1);
+                        int LA39_3 = input.LA(1);
 
                          
-                        int index41_6 = input.index();
+                        int index39_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23612,14 +23897,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_6);
+                        input.seek(index39_3);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA41_2 = input.LA(1);
+                        int LA39_4 = input.LA(1);
 
                          
-                        int index41_2 = input.index();
+                        int index39_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23627,14 +23912,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_2);
+                        input.seek(index39_4);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA41_4 = input.LA(1);
+                        int LA39_5 = input.LA(1);
 
                          
-                        int index41_4 = input.index();
+                        int index39_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23642,14 +23927,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_4);
+                        input.seek(index39_5);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA41_5 = input.LA(1);
+                        int LA39_7 = input.LA(1);
 
                          
-                        int index41_5 = input.index();
+                        int index39_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred13_InternalMenuDsl()) ) {s = 10;}
@@ -23657,19 +23942,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index41_5);
+                        input.seek(index39_7);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 41, _s, input);
+                new NoViableAltException(getDescription(), 39, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String dfa_34s = "\1\63\2\uffff\1\64\7\uffff";
-    static final String dfa_35s = "\1\102\2\uffff\1\77\7\uffff";
+    static final String dfa_34s = "\1\65\2\uffff\1\66\7\uffff";
+    static final String dfa_35s = "\1\104\2\uffff\1\101\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 = {
@@ -23691,11 +23976,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_37 = DFA.unpackEncodedString(dfa_37s);
     static final short[][] dfa_38 = unpackEncodedStringArray(dfa_38s);
 
-    class DFA44 extends DFA {
+    class DFA42 extends DFA {
 
-        public DFA44(BaseRecognizer recognizer) {
+        public DFA42(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 44;
+            this.decisionNumber = 42;
             this.eot = dfa_27;
             this.eof = dfa_27;
             this.min = dfa_34;
@@ -23705,17 +23990,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_38;
         }
         public String getDescription() {
-            return "2263:2: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
+            return "2363: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\147\1\0\114\uffff";
+    static final String dfa_42s = "\1\151\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 = {
-            "\5\2\5\uffff\1\2\6\uffff\1\2\12\uffff\4\2\1\uffff\1\2\1\uffff\1\1\2\2\1\uffff\44\2\1\uffff\30\2",
+            "\5\2\21\uffff\2\2\6\uffff\4\2\1\uffff\1\2\1\uffff\1\1\2\2\1\uffff\44\2\1\uffff\30\2",
             "\1\uffff",
             "",
             "",
@@ -23803,11 +24088,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
     static final short[][] dfa_45 = unpackEncodedStringArray(dfa_45s);
 
-    class DFA60 extends DFA {
+    class DFA58 extends DFA {
 
-        public DFA60(BaseRecognizer recognizer) {
+        public DFA58(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 60;
+            this.decisionNumber = 58;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -23817,17 +24102,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "3164: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 "3264: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 LA60_1 = input.LA(1);
+                        int LA58_1 = input.LA(1);
 
                          
-                        int index60_1 = input.index();
+                        int index58_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred22_InternalMenuDsl()) ) {s = 77;}
@@ -23835,23 +24120,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index60_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(), 60, _s, input);
+                new NoViableAltException(getDescription(), 58, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String dfa_46s = "\1\4\2\0\41\uffff";
-    static final String dfa_47s = "\1\146\2\0\41\uffff";
+    static final String dfa_47s = "\1\150\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\5\1\1\3\5\5\uffff\1\5\21\uffff\3\5\4\uffff\1\2\1\uffff\1\43\1\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\3\5\2\uffff\12\5\1\uffff\1\5",
+            "\1\5\1\1\3\5\21\uffff\1\5\7\uffff\3\5\4\uffff\1\2\1\uffff\1\43\1\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\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",
             "",
@@ -23894,11 +24179,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_49 = DFA.unpackEncodedString(dfa_49s);
     static final short[][] dfa_50 = unpackEncodedStringArray(dfa_50s);
 
-    class DFA59 extends DFA {
+    class DFA57 extends DFA {
 
-        public DFA59(BaseRecognizer recognizer) {
+        public DFA57(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 59;
+            this.decisionNumber = 57;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_46;
@@ -23908,40 +24193,40 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_50;
         }
         public String getDescription() {
-            return "3183:6: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
+            return "3283: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 LA59_0 = input.LA(1);
+                        int LA57_0 = input.LA(1);
 
                          
-                        int index59_0 = input.index();
+                        int index57_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA59_0==RULE_ID) ) {s = 1;}
+                        if ( (LA57_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA59_0==39) ) {s = 2;}
+                        else if ( (LA57_0==41) ) {s = 2;}
 
-                        else if ( (LA59_0==64) && (synpred23_InternalMenuDsl())) {s = 3;}
+                        else if ( (LA57_0==66) && (synpred23_InternalMenuDsl())) {s = 3;}
 
-                        else if ( (LA59_0==79) && (synpred23_InternalMenuDsl())) {s = 4;}
+                        else if ( (LA57_0==81) && (synpred23_InternalMenuDsl())) {s = 4;}
 
-                        else if ( (LA59_0==RULE_STRING||(LA59_0>=RULE_HEX && LA59_0<=RULE_DECIMAL)||LA59_0==14||(LA59_0>=32 && LA59_0<=34)||(LA59_0>=43 && LA59_0<=44)||LA59_0==51||(LA59_0>=67 && LA59_0<=68)||LA59_0==72||LA59_0==80||LA59_0==82||(LA59_0>=86 && LA59_0<=88)||(LA59_0>=91 && LA59_0<=100)||LA59_0==102) ) {s = 5;}
+                        else if ( (LA57_0==RULE_STRING||(LA57_0>=RULE_HEX && LA57_0<=RULE_DECIMAL)||LA57_0==26||(LA57_0>=34 && LA57_0<=36)||(LA57_0>=45 && LA57_0<=46)||LA57_0==53||(LA57_0>=69 && LA57_0<=70)||LA57_0==74||LA57_0==82||LA57_0==84||(LA57_0>=88 && LA57_0<=90)||(LA57_0>=93 && LA57_0<=102)||LA57_0==104) ) {s = 5;}
 
-                        else if ( (LA59_0==41) ) {s = 35;}
+                        else if ( (LA57_0==43) ) {s = 35;}
 
                          
-                        input.seek(index59_0);
+                        input.seek(index57_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA59_1 = input.LA(1);
+                        int LA57_1 = input.LA(1);
 
                          
-                        int index59_1 = input.index();
+                        int index57_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred23_InternalMenuDsl()) ) {s = 4;}
@@ -23949,14 +24234,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index59_1);
+                        input.seek(index57_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA59_2 = input.LA(1);
+                        int LA57_2 = input.LA(1);
 
                          
-                        int index59_2 = input.index();
+                        int index57_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred23_InternalMenuDsl()) ) {s = 4;}
@@ -23964,19 +24249,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index59_2);
+                        input.seek(index57_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 59, _s, input);
+                new NoViableAltException(getDescription(), 57, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_51s = {
-            "\5\2\5\uffff\1\2\6\uffff\1\2\12\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\1\2\1\1\42\2\1\uffff\30\2",
+            "\5\2\21\uffff\2\2\6\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\1\2\1\1\42\2\1\uffff\30\2",
             "\1\uffff",
             "",
             "",
@@ -24057,11 +24342,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     };
     static final short[][] dfa_51 = unpackEncodedStringArray(dfa_51s);
 
-    class DFA61 extends DFA {
+    class DFA59 extends DFA {
 
-        public DFA61(BaseRecognizer recognizer) {
+        public DFA59(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 61;
+            this.decisionNumber = 59;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -24071,17 +24356,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "3281:5: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
+            return "3381: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 LA61_1 = input.LA(1);
+                        int LA59_1 = input.LA(1);
 
                          
-                        int index61_1 = input.index();
+                        int index59_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred24_InternalMenuDsl()) ) {s = 77;}
@@ -24089,24 +24374,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index61_1);
+                        input.seek(index59_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 61, _s, input);
+                new NoViableAltException(getDescription(), 59, _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\146\26\uffff\1\0\10\uffff";
+    static final String dfa_54s = "\1\150\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\14\1\5\3\14\5\uffff\1\2\21\uffff\3\5\4\uffff\1\35\3\uffff\2\14\6\uffff\1\5\34\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\14\1\5\3\14\21\uffff\1\2\7\uffff\3\5\4\uffff\1\35\3\uffff\2\14\6\uffff\1\5\34\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",
             "",
             "",
             "",
@@ -24147,11 +24432,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_56 = DFA.unpackEncodedString(dfa_56s);
     static final short[][] dfa_57 = unpackEncodedStringArray(dfa_57s);
 
-    class DFA63 extends DFA {
+    class DFA61 extends DFA {
 
-        public DFA63(BaseRecognizer recognizer) {
+        public DFA61(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 63;
+            this.decisionNumber = 61;
             this.eot = dfa_52;
             this.eof = dfa_52;
             this.min = dfa_53;
@@ -24161,56 +24446,56 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_57;
         }
         public String getDescription() {
-            return "3326: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 "3426: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 LA63_0 = input.LA(1);
+                        int LA61_0 = input.LA(1);
 
                          
-                        int index63_0 = input.index();
+                        int index61_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA63_0==93) ) {s = 1;}
+                        if ( (LA61_0==95) ) {s = 1;}
 
-                        else if ( (LA63_0==14) ) {s = 2;}
+                        else if ( (LA61_0==26) ) {s = 2;}
 
-                        else if ( (LA63_0==82) ) {s = 3;}
+                        else if ( (LA61_0==84) ) {s = 3;}
 
-                        else if ( (LA63_0==102) && (synpred25_InternalMenuDsl())) {s = 4;}
+                        else if ( (LA61_0==104) && (synpred25_InternalMenuDsl())) {s = 4;}
 
-                        else if ( (LA63_0==RULE_ID||(LA63_0>=32 && LA63_0<=34)||LA63_0==51||(LA63_0>=91 && LA63_0<=92)) ) {s = 5;}
+                        else if ( (LA61_0==RULE_ID||(LA61_0>=34 && LA61_0<=36)||LA61_0==53||(LA61_0>=93 && LA61_0<=94)) ) {s = 5;}
 
-                        else if ( (LA63_0==RULE_STRING||(LA63_0>=RULE_HEX && LA63_0<=RULE_DECIMAL)||(LA63_0>=43 && LA63_0<=44)||(LA63_0>=94 && LA63_0<=97)) ) {s = 12;}
+                        else if ( (LA61_0==RULE_STRING||(LA61_0>=RULE_HEX && LA61_0<=RULE_DECIMAL)||(LA61_0>=45 && LA61_0<=46)||(LA61_0>=96 && LA61_0<=99)) ) {s = 12;}
 
-                        else if ( (LA63_0==80) ) {s = 22;}
+                        else if ( (LA61_0==82) ) {s = 22;}
 
-                        else if ( (LA63_0==86) ) {s = 23;}
+                        else if ( (LA61_0==88) ) {s = 23;}
 
-                        else if ( (LA63_0==87) ) {s = 24;}
+                        else if ( (LA61_0==89) ) {s = 24;}
 
-                        else if ( (LA63_0==88) ) {s = 25;}
+                        else if ( (LA61_0==90) ) {s = 25;}
 
-                        else if ( (LA63_0==98) ) {s = 26;}
+                        else if ( (LA61_0==100) ) {s = 26;}
 
-                        else if ( (LA63_0==99) ) {s = 27;}
+                        else if ( (LA61_0==101) ) {s = 27;}
 
-                        else if ( (LA63_0==100) ) {s = 28;}
+                        else if ( (LA61_0==102) ) {s = 28;}
 
-                        else if ( (LA63_0==39) ) {s = 29;}
+                        else if ( (LA61_0==41) ) {s = 29;}
 
                          
-                        input.seek(index63_0);
+                        input.seek(index61_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA63_23 = input.LA(1);
+                        int LA61_23 = input.LA(1);
 
                          
-                        int index63_23 = input.index();
+                        int index61_23 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred26_InternalMenuDsl()) ) {s = 30;}
@@ -24218,24 +24503,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 31;}
 
                          
-                        input.seek(index63_23);
+                        input.seek(index61_23);
                         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(), 61, _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\146\2\0\43\uffff";
+    static final String dfa_60s = "\1\150\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\5\1\1\3\5\5\uffff\1\5\21\uffff\3\5\4\uffff\1\2\3\uffff\3\5\5\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\17\5\1\uffff\1\5",
+            "\1\5\1\1\3\5\21\uffff\1\5\7\uffff\3\5\4\uffff\1\2\3\uffff\3\5\5\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\17\5\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -24282,11 +24567,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_62 = DFA.unpackEncodedString(dfa_62s);
     static final short[][] dfa_63 = unpackEncodedStringArray(dfa_63s);
 
-    class DFA72 extends DFA {
+    class DFA70 extends DFA {
 
-        public DFA72(BaseRecognizer recognizer) {
+        public DFA70(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 72;
+            this.decisionNumber = 70;
             this.eot = dfa_58;
             this.eof = dfa_58;
             this.min = dfa_59;
@@ -24296,38 +24581,38 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_63;
         }
         public String getDescription() {
-            return "3818:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
+            return "3918: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 LA72_0 = input.LA(1);
+                        int LA70_0 = input.LA(1);
 
                          
-                        int index72_0 = input.index();
+                        int index70_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA72_0==RULE_ID) ) {s = 1;}
+                        if ( (LA70_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA72_0==39) ) {s = 2;}
+                        else if ( (LA70_0==41) ) {s = 2;}
 
-                        else if ( (LA72_0==64) && (synpred29_InternalMenuDsl())) {s = 3;}
+                        else if ( (LA70_0==66) && (synpred29_InternalMenuDsl())) {s = 3;}
 
-                        else if ( (LA72_0==79) && (synpred29_InternalMenuDsl())) {s = 4;}
+                        else if ( (LA70_0==81) && (synpred29_InternalMenuDsl())) {s = 4;}
 
-                        else if ( (LA72_0==RULE_STRING||(LA72_0>=RULE_HEX && LA72_0<=RULE_DECIMAL)||LA72_0==14||(LA72_0>=32 && LA72_0<=34)||(LA72_0>=43 && LA72_0<=45)||LA72_0==51||(LA72_0>=67 && LA72_0<=68)||LA72_0==72||LA72_0==80||LA72_0==82||(LA72_0>=86 && LA72_0<=100)||LA72_0==102) ) {s = 5;}
+                        else if ( (LA70_0==RULE_STRING||(LA70_0>=RULE_HEX && LA70_0<=RULE_DECIMAL)||LA70_0==26||(LA70_0>=34 && LA70_0<=36)||(LA70_0>=45 && LA70_0<=47)||LA70_0==53||(LA70_0>=69 && LA70_0<=70)||LA70_0==74||LA70_0==82||LA70_0==84||(LA70_0>=88 && LA70_0<=102)||LA70_0==104) ) {s = 5;}
 
                          
-                        input.seek(index72_0);
+                        input.seek(index70_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA72_1 = input.LA(1);
+                        int LA70_1 = input.LA(1);
 
                          
-                        int index72_1 = input.index();
+                        int index70_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred29_InternalMenuDsl()) ) {s = 4;}
@@ -24335,14 +24620,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index72_1);
+                        input.seek(index70_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA72_2 = input.LA(1);
+                        int LA70_2 = input.LA(1);
 
                          
-                        int index72_2 = input.index();
+                        int index70_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred29_InternalMenuDsl()) ) {s = 4;}
@@ -24350,19 +24635,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index72_2);
+                        input.seek(index70_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 72, _s, input);
+                new NoViableAltException(getDescription(), 70, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_64s = {
-            "\5\2\5\uffff\1\2\21\uffff\3\2\4\uffff\1\1\3\uffff\2\2\6\uffff\1\2\14\uffff\1\2\2\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
+            "\5\2\21\uffff\1\2\7\uffff\3\2\4\uffff\1\1\3\uffff\2\2\6\uffff\1\2\14\uffff\1\2\2\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -24400,11 +24685,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     };
     static final short[][] dfa_64 = unpackEncodedStringArray(dfa_64s);
 
-    class DFA79 extends DFA {
+    class DFA77 extends DFA {
 
-        public DFA79(BaseRecognizer recognizer) {
+        public DFA77(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 79;
+            this.decisionNumber = 77;
             this.eot = dfa_14;
             this.eof = dfa_14;
             this.min = dfa_15;
@@ -24414,17 +24699,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_64;
         }
         public String getDescription() {
-            return "4284: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 "4384: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 LA79_1 = input.LA(1);
+                        int LA77_1 = input.LA(1);
 
                          
-                        int index79_1 = input.index();
+                        int index77_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred32_InternalMenuDsl()) ) {s = 34;}
@@ -24432,24 +24717,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index79_1);
+                        input.seek(index77_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 79, _s, input);
+                new NoViableAltException(getDescription(), 77, _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\146\2\0\37\uffff";
+    static final String dfa_67s = "\1\150\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\4\1\1\3\4\5\uffff\1\4\21\uffff\3\4\4\uffff\1\2\3\uffff\2\4\6\uffff\1\4\14\uffff\1\3\2\uffff\2\4\3\uffff\1\4\7\uffff\1\4\1\uffff\1\4\3\uffff\3\4\2\uffff\12\4\1\uffff\1\4",
+            "\1\4\1\1\3\4\21\uffff\1\4\7\uffff\3\4\4\uffff\1\2\3\uffff\2\4\6\uffff\1\4\14\uffff\1\3\2\uffff\2\4\3\uffff\1\4\7\uffff\1\4\1\uffff\1\4\3\uffff\3\4\2\uffff\12\4\1\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -24492,11 +24777,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_69 = DFA.unpackEncodedString(dfa_69s);
     static final short[][] dfa_70 = unpackEncodedStringArray(dfa_70s);
 
-    class DFA78 extends DFA {
+    class DFA76 extends DFA {
 
-        public DFA78(BaseRecognizer recognizer) {
+        public DFA76(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 78;
+            this.decisionNumber = 76;
             this.eot = dfa_65;
             this.eof = dfa_65;
             this.min = dfa_66;
@@ -24506,36 +24791,36 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_70;
         }
         public String getDescription() {
-            return "4353:5: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
+            return "4453: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 LA78_0 = input.LA(1);
+                        int LA76_0 = input.LA(1);
 
                          
-                        int index78_0 = input.index();
+                        int index76_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA78_0==RULE_ID) ) {s = 1;}
+                        if ( (LA76_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA78_0==39) ) {s = 2;}
+                        else if ( (LA76_0==41) ) {s = 2;}
 
-                        else if ( (LA78_0==64) && (synpred33_InternalMenuDsl())) {s = 3;}
+                        else if ( (LA76_0==66) && (synpred33_InternalMenuDsl())) {s = 3;}
 
-                        else if ( (LA78_0==RULE_STRING||(LA78_0>=RULE_HEX && LA78_0<=RULE_DECIMAL)||LA78_0==14||(LA78_0>=32 && LA78_0<=34)||(LA78_0>=43 && LA78_0<=44)||LA78_0==51||(LA78_0>=67 && LA78_0<=68)||LA78_0==72||LA78_0==80||LA78_0==82||(LA78_0>=86 && LA78_0<=88)||(LA78_0>=91 && LA78_0<=100)||LA78_0==102) ) {s = 4;}
+                        else if ( (LA76_0==RULE_STRING||(LA76_0>=RULE_HEX && LA76_0<=RULE_DECIMAL)||LA76_0==26||(LA76_0>=34 && LA76_0<=36)||(LA76_0>=45 && LA76_0<=46)||LA76_0==53||(LA76_0>=69 && LA76_0<=70)||LA76_0==74||LA76_0==82||LA76_0==84||(LA76_0>=88 && LA76_0<=90)||(LA76_0>=93 && LA76_0<=102)||LA76_0==104) ) {s = 4;}
 
                          
-                        input.seek(index78_0);
+                        input.seek(index76_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA78_1 = input.LA(1);
+                        int LA76_1 = input.LA(1);
 
                          
-                        int index78_1 = input.index();
+                        int index76_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred33_InternalMenuDsl()) ) {s = 3;}
@@ -24543,14 +24828,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index78_1);
+                        input.seek(index76_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA78_2 = input.LA(1);
+                        int LA76_2 = input.LA(1);
 
                          
-                        int index78_2 = input.index();
+                        int index76_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred33_InternalMenuDsl()) ) {s = 3;}
@@ -24558,23 +24843,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index78_2);
+                        input.seek(index76_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 78, _s, input);
+                new NoViableAltException(getDescription(), 76, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    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_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -24584,17 +24869,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "5482: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 "5582: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 LA101_1 = input.LA(1);
+                        int LA99_1 = input.LA(1);
 
                          
-                        int index101_1 = input.index();
+                        int index99_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred36_InternalMenuDsl()) ) {s = 77;}
@@ -24602,23 +24887,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index101_1);
+                        input.seek(index99_1);
                         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;
         }
     }
 
-    class DFA100 extends DFA {
+    class DFA98 extends DFA {
 
-        public DFA100(BaseRecognizer recognizer) {
+        public DFA98(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 100;
+            this.decisionNumber = 98;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_46;
@@ -24628,40 +24913,40 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_50;
         }
         public String getDescription() {
-            return "5501:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
+            return "5601: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 LA100_0 = input.LA(1);
+                        int LA98_0 = input.LA(1);
 
                          
-                        int index100_0 = input.index();
+                        int index98_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA100_0==RULE_ID) ) {s = 1;}
+                        if ( (LA98_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA100_0==39) ) {s = 2;}
+                        else if ( (LA98_0==41) ) {s = 2;}
 
-                        else if ( (LA100_0==64) && (synpred37_InternalMenuDsl())) {s = 3;}
+                        else if ( (LA98_0==66) && (synpred37_InternalMenuDsl())) {s = 3;}
 
-                        else if ( (LA100_0==79) && (synpred37_InternalMenuDsl())) {s = 4;}
+                        else if ( (LA98_0==81) && (synpred37_InternalMenuDsl())) {s = 4;}
 
-                        else if ( (LA100_0==RULE_STRING||(LA100_0>=RULE_HEX && LA100_0<=RULE_DECIMAL)||LA100_0==14||(LA100_0>=32 && LA100_0<=34)||(LA100_0>=43 && LA100_0<=44)||LA100_0==51||(LA100_0>=67 && LA100_0<=68)||LA100_0==72||LA100_0==80||LA100_0==82||(LA100_0>=86 && LA100_0<=88)||(LA100_0>=91 && LA100_0<=100)||LA100_0==102) ) {s = 5;}
+                        else if ( (LA98_0==RULE_STRING||(LA98_0>=RULE_HEX && LA98_0<=RULE_DECIMAL)||LA98_0==26||(LA98_0>=34 && LA98_0<=36)||(LA98_0>=45 && LA98_0<=46)||LA98_0==53||(LA98_0>=69 && LA98_0<=70)||LA98_0==74||LA98_0==82||LA98_0==84||(LA98_0>=88 && LA98_0<=90)||(LA98_0>=93 && LA98_0<=102)||LA98_0==104) ) {s = 5;}
 
-                        else if ( (LA100_0==41) ) {s = 35;}
+                        else if ( (LA98_0==43) ) {s = 35;}
 
                          
-                        input.seek(index100_0);
+                        input.seek(index98_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA100_1 = input.LA(1);
+                        int LA98_1 = input.LA(1);
 
                          
-                        int index100_1 = input.index();
+                        int index98_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred37_InternalMenuDsl()) ) {s = 4;}
@@ -24669,14 +24954,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index100_1);
+                        input.seek(index98_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA100_2 = input.LA(1);
+                        int LA98_2 = input.LA(1);
 
                          
-                        int index100_2 = input.index();
+                        int index98_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred37_InternalMenuDsl()) ) {s = 4;}
@@ -24684,23 +24969,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index100_2);
+                        input.seek(index98_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 100, _s, input);
+                new NoViableAltException(getDescription(), 98, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA102 extends DFA {
+    class DFA100 extends DFA {
 
-        public DFA102(BaseRecognizer recognizer) {
+        public DFA100(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 102;
+            this.decisionNumber = 100;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -24710,17 +24995,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "5599:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
+            return "5699: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 LA102_1 = input.LA(1);
+                        int LA100_1 = input.LA(1);
 
                          
-                        int index102_1 = input.index();
+                        int index100_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred38_InternalMenuDsl()) ) {s = 77;}
@@ -24728,19 +25013,19 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index102_1);
+                        input.seek(index100_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 102, _s, input);
+                new NoViableAltException(getDescription(), 100, _s, input);
             error(nvae);
             throw nvae;
         }
     }
     static final String[] dfa_71s = {
-            "\5\2\5\uffff\1\2\6\uffff\1\2\12\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2",
+            "\5\2\21\uffff\2\2\6\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2",
             "\1\uffff",
             "",
             "",
@@ -24821,11 +25106,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     };
     static final short[][] dfa_71 = unpackEncodedStringArray(dfa_71s);
 
-    class DFA106 extends DFA {
+    class DFA104 extends DFA {
 
-        public DFA106(BaseRecognizer recognizer) {
+        public DFA104(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 106;
+            this.decisionNumber = 104;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -24835,17 +25120,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_71;
         }
         public String getDescription() {
-            return "5758:3: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
+            return "5858: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 LA106_1 = input.LA(1);
+                        int LA104_1 = input.LA(1);
 
                          
-                        int index106_1 = input.index();
+                        int index104_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred39_InternalMenuDsl()) ) {s = 77;}
@@ -24853,23 +25138,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index106_1);
+                        input.seek(index104_1);
                         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(), 104, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA109 extends DFA {
+    class DFA107 extends DFA {
 
-        public DFA109(BaseRecognizer recognizer) {
+        public DFA107(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 109;
+            this.decisionNumber = 107;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -24879,17 +25164,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_45;
         }
         public String getDescription() {
-            return "5815: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 "5915: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 LA109_1 = input.LA(1);
+                        int LA107_1 = input.LA(1);
 
                          
-                        int index109_1 = input.index();
+                        int index107_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred40_InternalMenuDsl()) ) {s = 77;}
@@ -24897,23 +25182,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index109_1);
+                        input.seek(index107_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 109, _s, input);
+                new NoViableAltException(getDescription(), 107, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA108 extends DFA {
+    class DFA106 extends DFA {
 
-        public DFA108(BaseRecognizer recognizer) {
+        public DFA106(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 108;
+            this.decisionNumber = 106;
             this.eot = dfa_8;
             this.eof = dfa_8;
             this.min = dfa_46;
@@ -24923,40 +25208,40 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_50;
         }
         public String getDescription() {
-            return "5834:4: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
+            return "5934: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 LA108_0 = input.LA(1);
+                        int LA106_0 = input.LA(1);
 
                          
-                        int index108_0 = input.index();
+                        int index106_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA108_0==RULE_ID) ) {s = 1;}
+                        if ( (LA106_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA108_0==39) ) {s = 2;}
+                        else if ( (LA106_0==41) ) {s = 2;}
 
-                        else if ( (LA108_0==64) && (synpred41_InternalMenuDsl())) {s = 3;}
+                        else if ( (LA106_0==66) && (synpred41_InternalMenuDsl())) {s = 3;}
 
-                        else if ( (LA108_0==79) && (synpred41_InternalMenuDsl())) {s = 4;}
+                        else if ( (LA106_0==81) && (synpred41_InternalMenuDsl())) {s = 4;}
 
-                        else if ( (LA108_0==RULE_STRING||(LA108_0>=RULE_HEX && LA108_0<=RULE_DECIMAL)||LA108_0==14||(LA108_0>=32 && LA108_0<=34)||(LA108_0>=43 && LA108_0<=44)||LA108_0==51||(LA108_0>=67 && LA108_0<=68)||LA108_0==72||LA108_0==80||LA108_0==82||(LA108_0>=86 && LA108_0<=88)||(LA108_0>=91 && LA108_0<=100)||LA108_0==102) ) {s = 5;}
+                        else if ( (LA106_0==RULE_STRING||(LA106_0>=RULE_HEX && LA106_0<=RULE_DECIMAL)||LA106_0==26||(LA106_0>=34 && LA106_0<=36)||(LA106_0>=45 && LA106_0<=46)||LA106_0==53||(LA106_0>=69 && LA106_0<=70)||LA106_0==74||LA106_0==82||LA106_0==84||(LA106_0>=88 && LA106_0<=90)||(LA106_0>=93 && LA106_0<=102)||LA106_0==104) ) {s = 5;}
 
-                        else if ( (LA108_0==41) ) {s = 35;}
+                        else if ( (LA106_0==43) ) {s = 35;}
 
                          
-                        input.seek(index108_0);
+                        input.seek(index106_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA108_1 = input.LA(1);
+                        int LA106_1 = input.LA(1);
 
                          
-                        int index108_1 = input.index();
+                        int index106_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred41_InternalMenuDsl()) ) {s = 4;}
@@ -24964,14 +25249,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index108_1);
+                        input.seek(index106_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA108_2 = input.LA(1);
+                        int LA106_2 = input.LA(1);
 
                          
-                        int index108_2 = input.index();
+                        int index106_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred41_InternalMenuDsl()) ) {s = 4;}
@@ -24979,23 +25264,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index108_2);
+                        input.seek(index106_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 108, _s, input);
+                new NoViableAltException(getDescription(), 106, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA110 extends DFA {
+    class DFA108 extends DFA {
 
-        public DFA110(BaseRecognizer recognizer) {
+        public DFA108(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 110;
+            this.decisionNumber = 108;
             this.eot = dfa_39;
             this.eof = dfa_40;
             this.min = dfa_41;
@@ -25005,17 +25290,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_51;
         }
         public String getDescription() {
-            return "5932:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
+            return "6032: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 LA110_1 = input.LA(1);
+                        int LA108_1 = input.LA(1);
 
                          
-                        int index110_1 = input.index();
+                        int index108_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred42_InternalMenuDsl()) ) {s = 77;}
@@ -25023,24 +25308,24 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index110_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(), 110, _s, input);
+                new NoViableAltException(getDescription(), 108, _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\147\40\0\55\uffff";
+    static final String dfa_74s = "\1\151\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\27\1\1\1\23\1\24\1\25\5\uffff\1\12\6\uffff\1\41\12\uffff\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\17\41\1\10\1\7\3\41\1\6\6\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\27\1\1\1\23\1\24\1\25\21\uffff\1\12\1\41\6\uffff\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\17\41\1\10\1\7\3\41\1\6\6\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",
@@ -25126,11 +25411,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_76 = DFA.unpackEncodedString(dfa_76s);
     static final short[][] dfa_77 = unpackEncodedStringArray(dfa_77s);
 
-    class DFA113 extends DFA {
+    class DFA111 extends DFA {
 
-        public DFA113(BaseRecognizer recognizer) {
+        public DFA111(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 113;
+            this.decisionNumber = 111;
             this.eot = dfa_39;
             this.eof = dfa_72;
             this.min = dfa_73;
@@ -25140,17 +25425,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_77;
         }
         public String getDescription() {
-            return "6275: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 "6375: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 LA113_1 = input.LA(1);
+                        int LA111_1 = input.LA(1);
 
                          
-                        int index113_1 = input.index();
+                        int index111_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25158,14 +25443,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_1);
+                        input.seek(index111_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA113_2 = input.LA(1);
+                        int LA111_2 = input.LA(1);
 
                          
-                        int index113_2 = input.index();
+                        int index111_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25173,14 +25458,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_2);
+                        input.seek(index111_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA113_3 = input.LA(1);
+                        int LA111_3 = input.LA(1);
 
                          
-                        int index113_3 = input.index();
+                        int index111_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25188,14 +25473,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_3);
+                        input.seek(index111_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA113_4 = input.LA(1);
+                        int LA111_4 = input.LA(1);
 
                          
-                        int index113_4 = input.index();
+                        int index111_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25203,14 +25488,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_4);
+                        input.seek(index111_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA113_5 = input.LA(1);
+                        int LA111_5 = input.LA(1);
 
                          
-                        int index113_5 = input.index();
+                        int index111_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25218,14 +25503,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_5);
+                        input.seek(index111_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA113_6 = input.LA(1);
+                        int LA111_6 = input.LA(1);
 
                          
-                        int index113_6 = input.index();
+                        int index111_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25233,14 +25518,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_6);
+                        input.seek(index111_6);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA113_7 = input.LA(1);
+                        int LA111_7 = input.LA(1);
 
                          
-                        int index113_7 = input.index();
+                        int index111_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25248,14 +25533,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_7);
+                        input.seek(index111_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA113_8 = input.LA(1);
+                        int LA111_8 = input.LA(1);
 
                          
-                        int index113_8 = input.index();
+                        int index111_8 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25263,14 +25548,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_8);
+                        input.seek(index111_8);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA113_9 = input.LA(1);
+                        int LA111_9 = input.LA(1);
 
                          
-                        int index113_9 = input.index();
+                        int index111_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25278,14 +25563,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_9);
+                        input.seek(index111_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA113_10 = input.LA(1);
+                        int LA111_10 = input.LA(1);
 
                          
-                        int index113_10 = input.index();
+                        int index111_10 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25293,14 +25578,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_10);
+                        input.seek(index111_10);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA113_11 = input.LA(1);
+                        int LA111_11 = input.LA(1);
 
                          
-                        int index113_11 = input.index();
+                        int index111_11 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25308,14 +25593,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_11);
+                        input.seek(index111_11);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA113_12 = input.LA(1);
+                        int LA111_12 = input.LA(1);
 
                          
-                        int index113_12 = input.index();
+                        int index111_12 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25323,14 +25608,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_12);
+                        input.seek(index111_12);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA113_13 = input.LA(1);
+                        int LA111_13 = input.LA(1);
 
                          
-                        int index113_13 = input.index();
+                        int index111_13 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25338,14 +25623,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_13);
+                        input.seek(index111_13);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA113_14 = input.LA(1);
+                        int LA111_14 = input.LA(1);
 
                          
-                        int index113_14 = input.index();
+                        int index111_14 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25353,14 +25638,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_14);
+                        input.seek(index111_14);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA113_15 = input.LA(1);
+                        int LA111_15 = input.LA(1);
 
                          
-                        int index113_15 = input.index();
+                        int index111_15 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25368,14 +25653,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_15);
+                        input.seek(index111_15);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA113_16 = input.LA(1);
+                        int LA111_16 = input.LA(1);
 
                          
-                        int index113_16 = input.index();
+                        int index111_16 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25383,14 +25668,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_16);
+                        input.seek(index111_16);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA113_17 = input.LA(1);
+                        int LA111_17 = input.LA(1);
 
                          
-                        int index113_17 = input.index();
+                        int index111_17 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25398,14 +25683,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_17);
+                        input.seek(index111_17);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA113_18 = input.LA(1);
+                        int LA111_18 = input.LA(1);
 
                          
-                        int index113_18 = input.index();
+                        int index111_18 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25413,14 +25698,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_18);
+                        input.seek(index111_18);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA113_19 = input.LA(1);
+                        int LA111_19 = input.LA(1);
 
                          
-                        int index113_19 = input.index();
+                        int index111_19 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25428,14 +25713,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_19);
+                        input.seek(index111_19);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA113_20 = input.LA(1);
+                        int LA111_20 = input.LA(1);
 
                          
-                        int index113_20 = input.index();
+                        int index111_20 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25443,14 +25728,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_20);
+                        input.seek(index111_20);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA113_21 = input.LA(1);
+                        int LA111_21 = input.LA(1);
 
                          
-                        int index113_21 = input.index();
+                        int index111_21 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25458,14 +25743,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_21);
+                        input.seek(index111_21);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA113_22 = input.LA(1);
+                        int LA111_22 = input.LA(1);
 
                          
-                        int index113_22 = input.index();
+                        int index111_22 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25473,14 +25758,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_22);
+                        input.seek(index111_22);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA113_23 = input.LA(1);
+                        int LA111_23 = input.LA(1);
 
                          
-                        int index113_23 = input.index();
+                        int index111_23 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25488,14 +25773,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_23);
+                        input.seek(index111_23);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA113_24 = input.LA(1);
+                        int LA111_24 = input.LA(1);
 
                          
-                        int index113_24 = input.index();
+                        int index111_24 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25503,14 +25788,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_24);
+                        input.seek(index111_24);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA113_25 = input.LA(1);
+                        int LA111_25 = input.LA(1);
 
                          
-                        int index113_25 = input.index();
+                        int index111_25 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25518,14 +25803,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_25);
+                        input.seek(index111_25);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA113_26 = input.LA(1);
+                        int LA111_26 = input.LA(1);
 
                          
-                        int index113_26 = input.index();
+                        int index111_26 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25533,14 +25818,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_26);
+                        input.seek(index111_26);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA113_27 = input.LA(1);
+                        int LA111_27 = input.LA(1);
 
                          
-                        int index113_27 = input.index();
+                        int index111_27 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25548,14 +25833,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_27);
+                        input.seek(index111_27);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA113_28 = input.LA(1);
+                        int LA111_28 = input.LA(1);
 
                          
-                        int index113_28 = input.index();
+                        int index111_28 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25563,14 +25848,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_28);
+                        input.seek(index111_28);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA113_29 = input.LA(1);
+                        int LA111_29 = input.LA(1);
 
                          
-                        int index113_29 = input.index();
+                        int index111_29 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25578,14 +25863,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_29);
+                        input.seek(index111_29);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA113_30 = input.LA(1);
+                        int LA111_30 = input.LA(1);
 
                          
-                        int index113_30 = input.index();
+                        int index111_30 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25593,14 +25878,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_30);
+                        input.seek(index111_30);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA113_31 = input.LA(1);
+                        int LA111_31 = input.LA(1);
 
                          
-                        int index113_31 = input.index();
+                        int index111_31 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25608,14 +25893,14 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_31);
+                        input.seek(index111_31);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA113_32 = input.LA(1);
+                        int LA111_32 = input.LA(1);
 
                          
-                        int index113_32 = input.index();
+                        int index111_32 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred43_InternalMenuDsl()) ) {s = 77;}
@@ -25623,13 +25908,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 33;}
 
                          
-                        input.seek(index113_32);
+                        input.seek(index111_32);
                         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(), 111, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -25637,11 +25922,11 @@ public class InternalMenuDslParser 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\151\1\0\115\uffff";
+    static final String dfa_81s = "\1\153\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 = {
-            "\5\2\5\uffff\1\2\6\uffff\1\2\12\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2\1\uffff\1\2",
+            "\5\2\21\uffff\2\2\6\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -25730,11 +26015,11 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
     static final short[] dfa_83 = DFA.unpackEncodedString(dfa_83s);
     static final short[][] dfa_84 = unpackEncodedStringArray(dfa_84s);
 
-    class DFA131 extends DFA {
+    class DFA129 extends DFA {
 
-        public DFA131(BaseRecognizer recognizer) {
+        public DFA129(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 131;
+            this.decisionNumber = 129;
             this.eot = dfa_78;
             this.eof = dfa_79;
             this.min = dfa_80;
@@ -25744,17 +26029,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_84;
         }
         public String getDescription() {
-            return "6933: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 "7033: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 LA131_1 = input.LA(1);
+                        int LA129_1 = input.LA(1);
 
                          
-                        int index131_1 = input.index();
+                        int index129_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred50_InternalMenuDsl()) ) {s = 78;}
@@ -25762,23 +26047,23 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index131_1);
+                        input.seek(index129_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 131, _s, input);
+                new NoViableAltException(getDescription(), 129, _s, input);
             error(nvae);
             throw nvae;
         }
     }
 
-    class DFA129 extends DFA {
+    class DFA127 extends DFA {
 
-        public DFA129(BaseRecognizer recognizer) {
+        public DFA127(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 129;
+            this.decisionNumber = 127;
             this.eot = dfa_78;
             this.eof = dfa_79;
             this.min = dfa_80;
@@ -25788,17 +26073,17 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
             this.transition = dfa_84;
         }
         public String getDescription() {
-            return "7027:5: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
+            return "7127: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 LA129_1 = input.LA(1);
+                        int LA127_1 = input.LA(1);
 
                          
-                        int index129_1 = input.index();
+                        int index127_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred52_InternalMenuDsl()) ) {s = 78;}
@@ -25806,13 +26091,13 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index129_1);
+                        input.seek(index127_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 129, _s, input);
+                new NoViableAltException(getDescription(), 127, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -25821,104 +26106,104 @@ public class InternalMenuDslParser extends AbstractInternalAntlrParser {
 
     public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000002000L});
     public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000020L});
     public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x00000000007E0000L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x00000000007C0000L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000780000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000700000L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000600000L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x00000000FF804002L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x00000000FF004002L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00000000FE004002L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x00000000FC004002L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000001200000020L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000400000020L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000800000020L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000002000000002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x00000000000F0002L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x00000000000E0002L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x00000000000C0002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000080002L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000007F00002L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000018000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000024000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000048000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000380000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000300000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000004800000020L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000001000000020L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000002000000020L});
     public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x00081AC7000041F0L,0x0000005FF9C50118L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000030000000000L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x000818C7000041F0L,0x0000005FF9C50118L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x000838C7000041F0L,0x0000005FF9C50118L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000210000000000L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x001FC00000000002L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0030000000000000L});
-    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0040000000000002L});
-    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0F00000000000002L});
-    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x1038000000000002L});
-    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000008000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0xE018000000000002L,0x0000000000000007L});
-    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0008000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000018L});
-    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000800000002L,0x00000000000000E0L});
-    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
-    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000C00L});
-    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000002L,0x0000000000007000L});
-    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000700000020L,0x0000000008000000L});
-    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0008000700000020L,0x0000000018000000L});
-    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000008000000020L,0x0000010000000001L});
-    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0010010000000000L});
-    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000108000000002L,0x0000000000007000L});
-    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x00081AC7000041F0L,0x0000005FF9C58119L});
-    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000100000000002L,0x0000000000007000L});
-    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x000818C7002041F0L,0x0000005FF9C50118L});
-    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000010000200000L});
-    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x000838C7000041F0L,0x0000005FFFC58119L});
-    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000010000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x000838C7000041F0L,0x0000005FFFC50118L});
-    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x000818E7000041F2L,0x0000005FFFC50118L});
-    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x000818C7000041F2L,0x0000005FFFC50118L});
-    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x000818C7000041F0L,0x0000005FF9C50119L});
-    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000018000200020L,0x0000000000380001L});
-    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000010000000000L,0x0000000000280000L});
-    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000010000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x000818E7000041F0L,0x0000005FFFC50118L});
-    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000012000000000L});
-    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x000818C7000041F0L,0x0000005FFFC50118L});
-    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x000818E7000041F0L,0x0000005FF9C50118L});
-    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x000818C7002041F0L,0x0000005FFFC50118L});
-    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x000818E7002041F0L,0x0000005FFFC50118L});
-    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000108000000002L});
-    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0008108000000002L});
-    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000120000000000L});
-    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x000818C7000041F2L,0x0000005FF9C50118L});
-    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000000L,0x000000A000000000L});
-    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000002L,0x000000A000000000L});
-    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x00206B1C040001F0L,0x0000017FE7140460L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x00000C0000000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0020631C040001F0L,0x0000017FE7140460L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0020E31C040001F0L,0x0000017FE7140460L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000840000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000040000000002L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x007F000000000002L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x00C0000000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0100000000000002L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0200000000000002L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x3C00000000000002L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x40E0000000000002L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000020000000020L,0x0000000000000004L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x8060000000000002L,0x000000000000001FL});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0040000000000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0020000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000060L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000002000000002L,0x0000000000000380L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000002L,0x0000000000003000L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000002L,0x000000000001C000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000001C00000020L,0x0000000020000000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0020001C00000020L,0x0000000060000000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000020000000020L,0x0000040000000004L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0040040000000000L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000420000000002L,0x000000000001C000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x00206B1C040001F0L,0x0000017FE7160464L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000400000000002L,0x000000000001C000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0020631C0C0001F0L,0x0000017FE7140460L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000040008000000L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0020E31C040001F0L,0x0000017FFF160464L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000040000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0020E31C040001F0L,0x0000017FFF140460L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0020639C040001F2L,0x0000017FFF140460L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0020631C040001F2L,0x0000017FFF140460L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0020631C040001F0L,0x0000017FE7140464L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000060008000020L,0x0000000000E00004L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000040000000000L,0x0000000000A00000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000040000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0020639C040001F0L,0x0000017FFF140460L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000048000000000L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0020631C040001F0L,0x0000017FFF140460L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0020639C040001F0L,0x0000017FE7140460L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0020631C0C0001F0L,0x0000017FFF140460L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0020639C0C0001F0L,0x0000017FFF140460L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000100000000002L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000420000000002L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000400000000002L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0020420000000002L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000480000000000L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0020631C040001F2L,0x0000017FE7140460L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000000L,0x0000028000000000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000002L,0x0000028000000000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
     public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000180L});
-    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000028000000020L,0x0000000000000001L});
-    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0008000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000002L,0x0000000018000000L});
-    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000002L,0x0000020000000000L});
-    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000100000002L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x00000A0000000020L,0x0000000000000004L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0020000000000002L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0020000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000002L,0x0000000060000000L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000002L,0x0000080000000000L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000400000002L});
     public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000000022L});
 
 }
 \ No newline at end of file
diff --git a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSemanticSequencer.java b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSemanticSequencer.java
index 918ec0b..80b9108 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSemanticSequencer.java
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSemanticSequencer.java
@@ -7,10 +7,12 @@ import com.google.inject.Inject;
 import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.osbp.xtext.menu.MenuCategory;
 import org.eclipse.osbp.xtext.menu.MenuDslPackage;
 import org.eclipse.osbp.xtext.menu.MenuEntry;
 import org.eclipse.osbp.xtext.menu.MenuModel;
 import org.eclipse.osbp.xtext.menu.MenuPackage;
+import org.eclipse.osbp.xtext.menu.MenuTree;
 import org.eclipse.osbp.xtext.menu.services.MenuDslGrammarAccess;
 import org.eclipse.osbp.xtext.oxtype.oxtype.OXImportDeclaration;
 import org.eclipse.osbp.xtext.oxtype.oxtype.OXtypePackage;
@@ -81,6 +83,9 @@ public class MenuDslSemanticSequencer extends OXtypeSemanticSequencer {
 		Set<Parameter> parameters = context.getEnabledBooleanParameters();
 		if (epackage == MenuDslPackage.eINSTANCE)
 			switch (semanticObject.eClass().getClassifierID()) {
+			case MenuDslPackage.MENU_CATEGORY:
+				sequence_MenuCategory(context, (MenuCategory) semanticObject); 
+				return; 
 			case MenuDslPackage.MENU_ENTRY:
 				sequence_MenuEntry(context, (MenuEntry) semanticObject); 
 				return; 
@@ -90,6 +95,9 @@ public class MenuDslSemanticSequencer extends OXtypeSemanticSequencer {
 			case MenuDslPackage.MENU_PACKAGE:
 				sequence_MenuPackage(context, (MenuPackage) semanticObject); 
 				return; 
+			case MenuDslPackage.MENU_TREE:
+				sequence_MenuTree(context, (MenuTree) semanticObject); 
+				return; 
 			}
 		else if (epackage == OXtypePackage.eINSTANCE)
 			switch (semanticObject.eClass().getClassifierID()) {
@@ -400,23 +408,36 @@ public class MenuDslSemanticSequencer extends OXtypeSemanticSequencer {
 	
 	/**
 	 * Contexts:
-	 *     MenuEntry returns MenuEntry
+	 *     MenuCategory returns MenuCategory
 	 *
 	 * Constraint:
 	 *     (
-	 *         entryid=TRANSLATABLEID 
-	 *         (description?='describedBy' descriptionValue=TRANSLATABLESTRING)? 
-	 *         (hasImage?='image' image=STRING)? 
-	 *         showBadge?='showBadge'? 
+	 *         name=TRANSLATABLEID 
 	 *         (
-	 *             (hasProcess?='process' process=[Blip|ID]) | 
-	 *             (hasPerspective?='perspective' perspective=[Perspective|ID]) | 
 	 *             (hasTable?='table' table=[Table|ID]) | 
 	 *             (hasDialog?='dialog' dialog=[Dialog|ID]) | 
 	 *             hasUserFilter?='userFilter' | 
-	 *             hasKeyBinding?='keyBinding'
-	 *         )? 
-	 *         subentries+=MenuEntry*
+	 *             hasReportPrinter?='reportPrinter' | 
+	 *             hasKeyBinding?='keyBinding' | 
+	 *             hasSystemSettings?='systemSettings' | 
+	 *             trees+=MenuTree+
+	 *         )?
+	 *     )
+	 */
+	protected void sequence_MenuCategory(ISerializationContext context, MenuCategory semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     MenuEntry returns MenuEntry
+	 *
+	 * Constraint:
+	 *     (
+	 *         name=TRANSLATABLEID 
+	 *         (hasIcon?='icon' icon=STRING)? 
+	 *         ((hasProcess?='process' process=[Blip|ID]) | (hasPerspective?='perspective' perspective=[Perspective|ID]))
 	 *     )
 	 */
 	protected void sequence_MenuEntry(ISerializationContext context, MenuEntry semanticObject) {
@@ -429,7 +450,7 @@ public class MenuDslSemanticSequencer extends OXtypeSemanticSequencer {
 	 *     MenuModel returns MenuModel
 	 *
 	 * Constraint:
-	 *     ((importSection=XImportSection packages+=MenuPackage+) | packages+=MenuPackage+)?
+	 *     (importSection=XImportSection? menupackage=MenuPackage)
 	 */
 	protected void sequence_MenuModel(ISerializationContext context, MenuModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
@@ -446,11 +467,10 @@ public class MenuDslSemanticSequencer extends OXtypeSemanticSequencer {
 	 *         (
 	 *             expandedImage=STRING 
 	 *             collapsedImage=STRING 
-	 *             subMenuIsAccordion?='accordionSubmenu'? 
 	 *             height=STRING? 
 	 *             width=STRING? 
 	 *             hasDesigner?='designer'? 
-	 *             entries+=MenuEntry*
+	 *             categories+=MenuCategory*
 	 *         )?
 	 *     )
 	 */
@@ -459,4 +479,16 @@ public class MenuDslSemanticSequencer extends OXtypeSemanticSequencer {
 	}
 	
 	
+	/**
+	 * Contexts:
+	 *     MenuTree returns MenuTree
+	 *
+	 * Constraint:
+	 *     (name=TRANSLATABLEID (hasTooltip?='tooltip' tooltip=TRANSLATABLESTRING)? entries+=MenuEntry*)
+	 */
+	protected void sequence_MenuTree(ISerializationContext context, MenuTree semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
 }
diff --git a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSyntacticSequencer.java b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSyntacticSequencer.java
index 1c8f710..889a35e 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSyntacticSequencer.java
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/serializer/MenuDslSyntacticSequencer.java
@@ -21,7 +21,7 @@ import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
 public class MenuDslSyntacticSequencer extends AbstractSyntacticSequencer {
 
 	protected MenuDslGrammarAccess grammarAccess;
-	protected AbstractElementAlias match_MenuEntry___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q;
+	protected AbstractElementAlias match_MenuCategory___LeftCurlyBracketKeyword_2_6_0_RightCurlyBracketKeyword_2_6_2__q;
 	protected AbstractElementAlias match_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q;
 	protected AbstractElementAlias match_XBlockExpression_SemicolonKeyword_2_1_q;
 	protected AbstractElementAlias match_XExpressionInClosure_SemicolonKeyword_1_1_q;
@@ -33,7 +33,7 @@ public class MenuDslSyntacticSequencer extends AbstractSyntacticSequencer {
 	@Inject
 	protected void init(IGrammarAccess access) {
 		grammarAccess = (MenuDslGrammarAccess) access;
-		match_MenuEntry___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getMenuEntryAccess().getLeftCurlyBracketKeyword_7_0()), new TokenAlias(false, false, grammarAccess.getMenuEntryAccess().getRightCurlyBracketKeyword_7_2()));
+		match_MenuCategory___LeftCurlyBracketKeyword_2_6_0_RightCurlyBracketKeyword_2_6_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getMenuCategoryAccess().getLeftCurlyBracketKeyword_2_6_0()), new TokenAlias(false, false, grammarAccess.getMenuCategoryAccess().getRightCurlyBracketKeyword_2_6_2()));
 		match_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()));
 		match_XBlockExpression_SemicolonKeyword_2_1_q = new TokenAlias(false, true, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1());
 		match_XExpressionInClosure_SemicolonKeyword_1_1_q = new TokenAlias(false, true, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1());
@@ -80,8 +80,8 @@ public class MenuDslSyntacticSequencer extends AbstractSyntacticSequencer {
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if (match_MenuEntry___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q.equals(syntax))
-				emit_MenuEntry___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
+			if (match_MenuCategory___LeftCurlyBracketKeyword_2_6_0_RightCurlyBracketKeyword_2_6_2__q.equals(syntax))
+				emit_MenuCategory___LeftCurlyBracketKeyword_2_6_0_RightCurlyBracketKeyword_2_6_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
 			else if (match_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q.equals(syntax))
 				emit_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
 			else if (match_XBlockExpression_SemicolonKeyword_2_1_q.equals(syntax))
@@ -105,18 +105,9 @@ public class MenuDslSyntacticSequencer extends AbstractSyntacticSequencer {
 	 *     ('{' '}')?
 	 *
 	 * This ambiguous syntax occurs at:
-	 *     descriptionValue=TRANSLATABLESTRING (ambiguity) (rule end)
-	 *     dialog=[Dialog|ID] (ambiguity) (rule end)
-	 *     entryid=TRANSLATABLEID (ambiguity) (rule end)
-	 *     hasKeyBinding?='keyBinding' (ambiguity) (rule end)
-	 *     hasUserFilter?='userFilter' (ambiguity) (rule end)
-	 *     image=STRING (ambiguity) (rule end)
-	 *     perspective=[Perspective|ID] (ambiguity) (rule end)
-	 *     process=[Blip|ID] (ambiguity) (rule end)
-	 *     showBadge?='showBadge' (ambiguity) (rule end)
-	 *     table=[Table|ID] (ambiguity) (rule end)
+	 *     name=TRANSLATABLEID (ambiguity) (rule end)
 	 */
-	protected void emit_MenuEntry___LeftCurlyBracketKeyword_7_0_RightCurlyBracketKeyword_7_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+	protected void emit_MenuCategory___LeftCurlyBracketKeyword_2_6_0_RightCurlyBracketKeyword_2_6_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
 		acceptNodes(transition, nodes);
 	}
 	
diff --git a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/services/MenuDslGrammarAccess.java b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/services/MenuDslGrammarAccess.java
index d0c2530..d455559 100644
--- a/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/services/MenuDslGrammarAccess.java
+++ b/org.eclipse.osbp.xtext.menu/src-gen/org/eclipse/osbp/xtext/menu/services/MenuDslGrammarAccess.java
@@ -32,15 +32,15 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cImportSectionAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cImportSectionXImportSectionParserRuleCall_0_0 = (RuleCall)cImportSectionAssignment_0.eContents().get(0);
-		private final Assignment cPackagesAssignment_1 = (Assignment)cGroup.eContents().get(1);
-		private final RuleCall cPackagesMenuPackageParserRuleCall_1_0 = (RuleCall)cPackagesAssignment_1.eContents().get(0);
+		private final Assignment cMenupackageAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall cMenupackageMenuPackageParserRuleCall_1_0 = (RuleCall)cMenupackageAssignment_1.eContents().get(0);
 		
 		//MenuModel:
 		//	importSection=XImportSection?
-		//	packages+=MenuPackage*;
+		//	menupackage=MenuPackage;
 		@Override public ParserRule getRule() { return rule; }
 		
-		//importSection=XImportSection? packages+=MenuPackage*
+		//importSection=XImportSection? menupackage=MenuPackage
 		public Group getGroup() { return cGroup; }
 		
 		//importSection=XImportSection?
@@ -49,11 +49,11 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 		//XImportSection
 		public RuleCall getImportSectionXImportSectionParserRuleCall_0_0() { return cImportSectionXImportSectionParserRuleCall_0_0; }
 		
-		//packages+=MenuPackage*
-		public Assignment getPackagesAssignment_1() { return cPackagesAssignment_1; }
+		//menupackage=MenuPackage
+		public Assignment getMenupackageAssignment_1() { return cMenupackageAssignment_1; }
 		
 		//MenuPackage
-		public RuleCall getPackagesMenuPackageParserRuleCall_1_0() { return cPackagesMenuPackageParserRuleCall_1_0; }
+		public RuleCall getMenupackageMenuPackageParserRuleCall_1_0() { return cMenupackageMenuPackageParserRuleCall_1_0; }
 	}
 	public class MenuPackageElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.menu.MenuDsl.MenuPackage");
@@ -63,40 +63,34 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 		private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
 		private final RuleCall cNameQualifiedNameParserRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
 		private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
-		private final Keyword cLeftCurlyBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
-		private final Keyword cExpandedImageKeyword_3_1 = (Keyword)cGroup_3.eContents().get(1);
-		private final Assignment cExpandedImageAssignment_3_2 = (Assignment)cGroup_3.eContents().get(2);
-		private final RuleCall cExpandedImageSTRINGTerminalRuleCall_3_2_0 = (RuleCall)cExpandedImageAssignment_3_2.eContents().get(0);
-		private final Keyword cCollapsedImageKeyword_3_3 = (Keyword)cGroup_3.eContents().get(3);
-		private final Assignment cCollapsedImageAssignment_3_4 = (Assignment)cGroup_3.eContents().get(4);
-		private final RuleCall cCollapsedImageSTRINGTerminalRuleCall_3_4_0 = (RuleCall)cCollapsedImageAssignment_3_4.eContents().get(0);
-		private final Assignment cSubMenuIsAccordionAssignment_3_5 = (Assignment)cGroup_3.eContents().get(5);
-		private final Keyword cSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0 = (Keyword)cSubMenuIsAccordionAssignment_3_5.eContents().get(0);
-		private final Group cGroup_3_6 = (Group)cGroup_3.eContents().get(6);
-		private final Keyword cHeightKeyword_3_6_0 = (Keyword)cGroup_3_6.eContents().get(0);
-		private final Assignment cHeightAssignment_3_6_1 = (Assignment)cGroup_3_6.eContents().get(1);
-		private final RuleCall cHeightSTRINGTerminalRuleCall_3_6_1_0 = (RuleCall)cHeightAssignment_3_6_1.eContents().get(0);
-		private final Group cGroup_3_7 = (Group)cGroup_3.eContents().get(7);
-		private final Keyword cWidthKeyword_3_7_0 = (Keyword)cGroup_3_7.eContents().get(0);
-		private final Assignment cWidthAssignment_3_7_1 = (Assignment)cGroup_3_7.eContents().get(1);
-		private final RuleCall cWidthSTRINGTerminalRuleCall_3_7_1_0 = (RuleCall)cWidthAssignment_3_7_1.eContents().get(0);
-		private final Assignment cHasDesignerAssignment_3_8 = (Assignment)cGroup_3.eContents().get(8);
-		private final Keyword cHasDesignerDesignerKeyword_3_8_0 = (Keyword)cHasDesignerAssignment_3_8.eContents().get(0);
-		private final Assignment cEntriesAssignment_3_9 = (Assignment)cGroup_3.eContents().get(9);
-		private final RuleCall cEntriesMenuEntryParserRuleCall_3_9_0 = (RuleCall)cEntriesAssignment_3_9.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_3_10 = (Keyword)cGroup_3.eContents().get(10);
+		private final Keyword cExpandedImageKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
+		private final Assignment cExpandedImageAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
+		private final RuleCall cExpandedImageSTRINGTerminalRuleCall_3_1_0 = (RuleCall)cExpandedImageAssignment_3_1.eContents().get(0);
+		private final Keyword cCollapsedImageKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);
+		private final Assignment cCollapsedImageAssignment_3_3 = (Assignment)cGroup_3.eContents().get(3);
+		private final RuleCall cCollapsedImageSTRINGTerminalRuleCall_3_3_0 = (RuleCall)cCollapsedImageAssignment_3_3.eContents().get(0);
+		private final Group cGroup_3_4 = (Group)cGroup_3.eContents().get(4);
+		private final Keyword cHeightKeyword_3_4_0 = (Keyword)cGroup_3_4.eContents().get(0);
+		private final Assignment cHeightAssignment_3_4_1 = (Assignment)cGroup_3_4.eContents().get(1);
+		private final RuleCall cHeightSTRINGTerminalRuleCall_3_4_1_0 = (RuleCall)cHeightAssignment_3_4_1.eContents().get(0);
+		private final Group cGroup_3_5 = (Group)cGroup_3.eContents().get(5);
+		private final Keyword cWidthKeyword_3_5_0 = (Keyword)cGroup_3_5.eContents().get(0);
+		private final Assignment cWidthAssignment_3_5_1 = (Assignment)cGroup_3_5.eContents().get(1);
+		private final RuleCall cWidthSTRINGTerminalRuleCall_3_5_1_0 = (RuleCall)cWidthAssignment_3_5_1.eContents().get(0);
+		private final Assignment cHasDesignerAssignment_3_6 = (Assignment)cGroup_3.eContents().get(6);
+		private final Keyword cHasDesignerDesignerKeyword_3_6_0 = (Keyword)cHasDesignerAssignment_3_6.eContents().get(0);
+		private final Assignment cCategoriesAssignment_3_7 = (Assignment)cGroup_3.eContents().get(7);
+		private final RuleCall cCategoriesMenuCategoryParserRuleCall_3_7_0 = (RuleCall)cCategoriesAssignment_3_7.eContents().get(0);
 		
 		//MenuPackage:
-		//	{MenuPackage} 'package' name=QualifiedName ('{'
-		//	'expandedImage' expandedImage=STRING 'collapsedImage' collapsedImage=STRING
-		//	subMenuIsAccordion?='accordionSubmenu'? ('height' height=STRING)? ('width' width=STRING)?
+		//	{MenuPackage} 'package' name=QualifiedName ('expandedImage' expandedImage=STRING 'collapsedImage'
+		//	collapsedImage=STRING ('height' height=STRING)? ('width' width=STRING)?
 		//	hasDesigner?='designer'?
-		//	entries+=MenuEntry* '}')?;
+		//	categories+=MenuCategory*)?;
 		@Override public ParserRule getRule() { return rule; }
 		
-		//{MenuPackage} 'package' name=QualifiedName ('{' 'expandedImage' expandedImage=STRING 'collapsedImage'
-		//collapsedImage=STRING subMenuIsAccordion?='accordionSubmenu'? ('height' height=STRING)? ('width' width=STRING)?
-		//hasDesigner?='designer'? entries+=MenuEntry* '}')?
+		//{MenuPackage} 'package' name=QualifiedName ('expandedImage' expandedImage=STRING 'collapsedImage' collapsedImage=STRING
+		//('height' height=STRING)? ('width' width=STRING)? hasDesigner?='designer'? categories+=MenuCategory*)?
 		public Group getGroup() { return cGroup; }
 		
 		//{MenuPackage}
@@ -111,297 +105,354 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 		//QualifiedName
 		public RuleCall getNameQualifiedNameParserRuleCall_2_0() { return cNameQualifiedNameParserRuleCall_2_0; }
 		
-		//('{' 'expandedImage' expandedImage=STRING 'collapsedImage' collapsedImage=STRING subMenuIsAccordion?='accordionSubmenu'?
-		//('height' height=STRING)? ('width' width=STRING)? hasDesigner?='designer'? entries+=MenuEntry* '}')?
+		//('expandedImage' expandedImage=STRING 'collapsedImage' collapsedImage=STRING ('height' height=STRING)? ('width'
+		//width=STRING)? hasDesigner?='designer'? categories+=MenuCategory*)?
 		public Group getGroup_3() { return cGroup_3; }
 		
-		//'{'
-		public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
-		
 		//'expandedImage'
-		public Keyword getExpandedImageKeyword_3_1() { return cExpandedImageKeyword_3_1; }
+		public Keyword getExpandedImageKeyword_3_0() { return cExpandedImageKeyword_3_0; }
 		
 		//expandedImage=STRING
-		public Assignment getExpandedImageAssignment_3_2() { return cExpandedImageAssignment_3_2; }
+		public Assignment getExpandedImageAssignment_3_1() { return cExpandedImageAssignment_3_1; }
 		
 		//STRING
-		public RuleCall getExpandedImageSTRINGTerminalRuleCall_3_2_0() { return cExpandedImageSTRINGTerminalRuleCall_3_2_0; }
+		public RuleCall getExpandedImageSTRINGTerminalRuleCall_3_1_0() { return cExpandedImageSTRINGTerminalRuleCall_3_1_0; }
 		
 		//'collapsedImage'
-		public Keyword getCollapsedImageKeyword_3_3() { return cCollapsedImageKeyword_3_3; }
+		public Keyword getCollapsedImageKeyword_3_2() { return cCollapsedImageKeyword_3_2; }
 		
 		//collapsedImage=STRING
-		public Assignment getCollapsedImageAssignment_3_4() { return cCollapsedImageAssignment_3_4; }
+		public Assignment getCollapsedImageAssignment_3_3() { return cCollapsedImageAssignment_3_3; }
 		
 		//STRING
-		public RuleCall getCollapsedImageSTRINGTerminalRuleCall_3_4_0() { return cCollapsedImageSTRINGTerminalRuleCall_3_4_0; }
-		
-		//subMenuIsAccordion?='accordionSubmenu'?
-		public Assignment getSubMenuIsAccordionAssignment_3_5() { return cSubMenuIsAccordionAssignment_3_5; }
-		
-		//'accordionSubmenu'
-		public Keyword getSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0() { return cSubMenuIsAccordionAccordionSubmenuKeyword_3_5_0; }
+		public RuleCall getCollapsedImageSTRINGTerminalRuleCall_3_3_0() { return cCollapsedImageSTRINGTerminalRuleCall_3_3_0; }
 		
 		//('height' height=STRING)?
-		public Group getGroup_3_6() { return cGroup_3_6; }
+		public Group getGroup_3_4() { return cGroup_3_4; }
 		
 		//'height'
-		public Keyword getHeightKeyword_3_6_0() { return cHeightKeyword_3_6_0; }
+		public Keyword getHeightKeyword_3_4_0() { return cHeightKeyword_3_4_0; }
 		
 		//height=STRING
-		public Assignment getHeightAssignment_3_6_1() { return cHeightAssignment_3_6_1; }
+		public Assignment getHeightAssignment_3_4_1() { return cHeightAssignment_3_4_1; }
 		
 		//STRING
-		public RuleCall getHeightSTRINGTerminalRuleCall_3_6_1_0() { return cHeightSTRINGTerminalRuleCall_3_6_1_0; }
+		public RuleCall getHeightSTRINGTerminalRuleCall_3_4_1_0() { return cHeightSTRINGTerminalRuleCall_3_4_1_0; }
 		
 		//('width' width=STRING)?
-		public Group getGroup_3_7() { return cGroup_3_7; }
+		public Group getGroup_3_5() { return cGroup_3_5; }
 		
 		//'width'
-		public Keyword getWidthKeyword_3_7_0() { return cWidthKeyword_3_7_0; }
+		public Keyword getWidthKeyword_3_5_0() { return cWidthKeyword_3_5_0; }
 		
 		//width=STRING
-		public Assignment getWidthAssignment_3_7_1() { return cWidthAssignment_3_7_1; }
+		public Assignment getWidthAssignment_3_5_1() { return cWidthAssignment_3_5_1; }
 		
 		//STRING
-		public RuleCall getWidthSTRINGTerminalRuleCall_3_7_1_0() { return cWidthSTRINGTerminalRuleCall_3_7_1_0; }
+		public RuleCall getWidthSTRINGTerminalRuleCall_3_5_1_0() { return cWidthSTRINGTerminalRuleCall_3_5_1_0; }
 		
 		//hasDesigner?='designer'?
-		public Assignment getHasDesignerAssignment_3_8() { return cHasDesignerAssignment_3_8; }
+		public Assignment getHasDesignerAssignment_3_6() { return cHasDesignerAssignment_3_6; }
 		
 		//'designer'
-		public Keyword getHasDesignerDesignerKeyword_3_8_0() { return cHasDesignerDesignerKeyword_3_8_0; }
+		public Keyword getHasDesignerDesignerKeyword_3_6_0() { return cHasDesignerDesignerKeyword_3_6_0; }
 		
-		//entries+=MenuEntry*
-		public Assignment getEntriesAssignment_3_9() { return cEntriesAssignment_3_9; }
-		
-		//MenuEntry
-		public RuleCall getEntriesMenuEntryParserRuleCall_3_9_0() { return cEntriesMenuEntryParserRuleCall_3_9_0; }
+		//categories+=MenuCategory*
+		public Assignment getCategoriesAssignment_3_7() { return cCategoriesAssignment_3_7; }
 		
-		//'}'
-		public Keyword getRightCurlyBracketKeyword_3_10() { return cRightCurlyBracketKeyword_3_10; }
+		//MenuCategory
+		public RuleCall getCategoriesMenuCategoryParserRuleCall_3_7_0() { return cCategoriesMenuCategoryParserRuleCall_3_7_0; }
 	}
-	public class MenuEntryElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
+	public class MenuCategoryElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.menu.MenuDsl.MenuCategory");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cMenuEntryAction_0 = (Action)cGroup.eContents().get(0);
-		private final Keyword cEntryKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final Assignment cEntryidAssignment_2 = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall cEntryidTRANSLATABLEIDParserRuleCall_2_0 = (RuleCall)cEntryidAssignment_2.eContents().get(0);
-		private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
-		private final Assignment cDescriptionAssignment_3_0 = (Assignment)cGroup_3.eContents().get(0);
-		private final Keyword cDescriptionDescribedByKeyword_3_0_0 = (Keyword)cDescriptionAssignment_3_0.eContents().get(0);
-		private final Assignment cDescriptionValueAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
-		private final RuleCall cDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0 = (RuleCall)cDescriptionValueAssignment_3_1.eContents().get(0);
-		private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
-		private final Assignment cHasImageAssignment_4_0 = (Assignment)cGroup_4.eContents().get(0);
-		private final Keyword cHasImageImageKeyword_4_0_0 = (Keyword)cHasImageAssignment_4_0.eContents().get(0);
-		private final Assignment cImageAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
-		private final RuleCall cImageSTRINGTerminalRuleCall_4_1_0 = (RuleCall)cImageAssignment_4_1.eContents().get(0);
-		private final Assignment cShowBadgeAssignment_5 = (Assignment)cGroup.eContents().get(5);
-		private final Keyword cShowBadgeShowBadgeKeyword_5_0 = (Keyword)cShowBadgeAssignment_5.eContents().get(0);
-		private final Alternatives cAlternatives_6 = (Alternatives)cGroup.eContents().get(6);
-		private final Group cGroup_6_0 = (Group)cAlternatives_6.eContents().get(0);
-		private final Assignment cHasProcessAssignment_6_0_0 = (Assignment)cGroup_6_0.eContents().get(0);
-		private final Keyword cHasProcessProcessKeyword_6_0_0_0 = (Keyword)cHasProcessAssignment_6_0_0.eContents().get(0);
-		private final Assignment cProcessAssignment_6_0_1 = (Assignment)cGroup_6_0.eContents().get(1);
-		private final CrossReference cProcessBlipCrossReference_6_0_1_0 = (CrossReference)cProcessAssignment_6_0_1.eContents().get(0);
-		private final RuleCall cProcessBlipIDTerminalRuleCall_6_0_1_0_1 = (RuleCall)cProcessBlipCrossReference_6_0_1_0.eContents().get(1);
-		private final Group cGroup_6_1 = (Group)cAlternatives_6.eContents().get(1);
-		private final Assignment cHasPerspectiveAssignment_6_1_0 = (Assignment)cGroup_6_1.eContents().get(0);
-		private final Keyword cHasPerspectivePerspectiveKeyword_6_1_0_0 = (Keyword)cHasPerspectiveAssignment_6_1_0.eContents().get(0);
-		private final Assignment cPerspectiveAssignment_6_1_1 = (Assignment)cGroup_6_1.eContents().get(1);
-		private final CrossReference cPerspectivePerspectiveCrossReference_6_1_1_0 = (CrossReference)cPerspectiveAssignment_6_1_1.eContents().get(0);
-		private final RuleCall cPerspectivePerspectiveIDTerminalRuleCall_6_1_1_0_1 = (RuleCall)cPerspectivePerspectiveCrossReference_6_1_1_0.eContents().get(1);
-		private final Group cGroup_6_2 = (Group)cAlternatives_6.eContents().get(2);
-		private final Assignment cHasTableAssignment_6_2_0 = (Assignment)cGroup_6_2.eContents().get(0);
-		private final Keyword cHasTableTableKeyword_6_2_0_0 = (Keyword)cHasTableAssignment_6_2_0.eContents().get(0);
-		private final Assignment cTableAssignment_6_2_1 = (Assignment)cGroup_6_2.eContents().get(1);
-		private final CrossReference cTableTableCrossReference_6_2_1_0 = (CrossReference)cTableAssignment_6_2_1.eContents().get(0);
-		private final RuleCall cTableTableIDTerminalRuleCall_6_2_1_0_1 = (RuleCall)cTableTableCrossReference_6_2_1_0.eContents().get(1);
-		private final Group cGroup_6_3 = (Group)cAlternatives_6.eContents().get(3);
-		private final Assignment cHasDialogAssignment_6_3_0 = (Assignment)cGroup_6_3.eContents().get(0);
-		private final Keyword cHasDialogDialogKeyword_6_3_0_0 = (Keyword)cHasDialogAssignment_6_3_0.eContents().get(0);
-		private final Assignment cDialogAssignment_6_3_1 = (Assignment)cGroup_6_3.eContents().get(1);
-		private final CrossReference cDialogDialogCrossReference_6_3_1_0 = (CrossReference)cDialogAssignment_6_3_1.eContents().get(0);
-		private final RuleCall cDialogDialogIDTerminalRuleCall_6_3_1_0_1 = (RuleCall)cDialogDialogCrossReference_6_3_1_0.eContents().get(1);
-		private final Assignment cHasUserFilterAssignment_6_4 = (Assignment)cAlternatives_6.eContents().get(4);
-		private final Keyword cHasUserFilterUserFilterKeyword_6_4_0 = (Keyword)cHasUserFilterAssignment_6_4.eContents().get(0);
-		private final Assignment cHasKeyBindingAssignment_6_5 = (Assignment)cAlternatives_6.eContents().get(5);
-		private final Keyword cHasKeyBindingKeyBindingKeyword_6_5_0 = (Keyword)cHasKeyBindingAssignment_6_5.eContents().get(0);
-		private final Group cGroup_7 = (Group)cGroup.eContents().get(7);
-		private final Keyword cLeftCurlyBracketKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0);
-		private final Assignment cSubentriesAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);
-		private final RuleCall cSubentriesMenuEntryParserRuleCall_7_1_0 = (RuleCall)cSubentriesAssignment_7_1.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_7_2 = (Keyword)cGroup_7.eContents().get(2);
-		
-		//MenuEntry:
-		//	{MenuEntry} 'entry' entryid=TRANSLATABLEID (description?='describedBy' descriptionValue=TRANSLATABLESTRING)?
-		//	(hasImage?='image' image=STRING)?
-		//	showBadge?='showBadge'? (hasProcess?='process' process=[blip::Blip] | hasPerspective?='perspective'
-		//	perspective=[perspective::Perspective] | hasTable?='table' table=[table::Table] | hasDialog?='dialog'
-		//	dialog=[dialog::Dialog] | hasUserFilter?='userFilter' | hasKeyBinding?='keyBinding')? ('{' subentries+=MenuEntry*
-		//	'}')?;
+		private final Keyword cCategoryKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall cNameTRANSLATABLEIDParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+		private final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2);
+		private final Group cGroup_2_0 = (Group)cAlternatives_2.eContents().get(0);
+		private final Assignment cHasTableAssignment_2_0_0 = (Assignment)cGroup_2_0.eContents().get(0);
+		private final Keyword cHasTableTableKeyword_2_0_0_0 = (Keyword)cHasTableAssignment_2_0_0.eContents().get(0);
+		private final Assignment cTableAssignment_2_0_1 = (Assignment)cGroup_2_0.eContents().get(1);
+		private final CrossReference cTableTableCrossReference_2_0_1_0 = (CrossReference)cTableAssignment_2_0_1.eContents().get(0);
+		private final RuleCall cTableTableIDTerminalRuleCall_2_0_1_0_1 = (RuleCall)cTableTableCrossReference_2_0_1_0.eContents().get(1);
+		private final Group cGroup_2_1 = (Group)cAlternatives_2.eContents().get(1);
+		private final Assignment cHasDialogAssignment_2_1_0 = (Assignment)cGroup_2_1.eContents().get(0);
+		private final Keyword cHasDialogDialogKeyword_2_1_0_0 = (Keyword)cHasDialogAssignment_2_1_0.eContents().get(0);
+		private final Assignment cDialogAssignment_2_1_1 = (Assignment)cGroup_2_1.eContents().get(1);
+		private final CrossReference cDialogDialogCrossReference_2_1_1_0 = (CrossReference)cDialogAssignment_2_1_1.eContents().get(0);
+		private final RuleCall cDialogDialogIDTerminalRuleCall_2_1_1_0_1 = (RuleCall)cDialogDialogCrossReference_2_1_1_0.eContents().get(1);
+		private final Assignment cHasUserFilterAssignment_2_2 = (Assignment)cAlternatives_2.eContents().get(2);
+		private final Keyword cHasUserFilterUserFilterKeyword_2_2_0 = (Keyword)cHasUserFilterAssignment_2_2.eContents().get(0);
+		private final Assignment cHasReportPrinterAssignment_2_3 = (Assignment)cAlternatives_2.eContents().get(3);
+		private final Keyword cHasReportPrinterReportPrinterKeyword_2_3_0 = (Keyword)cHasReportPrinterAssignment_2_3.eContents().get(0);
+		private final Assignment cHasKeyBindingAssignment_2_4 = (Assignment)cAlternatives_2.eContents().get(4);
+		private final Keyword cHasKeyBindingKeyBindingKeyword_2_4_0 = (Keyword)cHasKeyBindingAssignment_2_4.eContents().get(0);
+		private final Assignment cHasSystemSettingsAssignment_2_5 = (Assignment)cAlternatives_2.eContents().get(5);
+		private final Keyword cHasSystemSettingsSystemSettingsKeyword_2_5_0 = (Keyword)cHasSystemSettingsAssignment_2_5.eContents().get(0);
+		private final Group cGroup_2_6 = (Group)cAlternatives_2.eContents().get(6);
+		private final Keyword cLeftCurlyBracketKeyword_2_6_0 = (Keyword)cGroup_2_6.eContents().get(0);
+		private final Assignment cTreesAssignment_2_6_1 = (Assignment)cGroup_2_6.eContents().get(1);
+		private final RuleCall cTreesMenuTreeParserRuleCall_2_6_1_0 = (RuleCall)cTreesAssignment_2_6_1.eContents().get(0);
+		private final Keyword cRightCurlyBracketKeyword_2_6_2 = (Keyword)cGroup_2_6.eContents().get(2);
+		
+		//MenuCategory:
+		//	'category' name=TRANSLATABLEID (hasTable?='table' table=[table::Table] | hasDialog?='dialog' dialog=[dialog::Dialog] |
+		//	hasUserFilter?='userFilter' | hasReportPrinter?='reportPrinter' | hasKeyBinding?='keyBinding' |
+		//	hasSystemSettings?='systemSettings' |
+		//	'{' trees+=MenuTree* '}')?;
 		@Override public ParserRule getRule() { return rule; }
 		
-		//{MenuEntry} 'entry' entryid=TRANSLATABLEID (description?='describedBy' descriptionValue=TRANSLATABLESTRING)?
-		//(hasImage?='image' image=STRING)? showBadge?='showBadge'? (hasProcess?='process' process=[blip::Blip] |
-		//hasPerspective?='perspective' perspective=[perspective::Perspective] | hasTable?='table' table=[table::Table] |
-		//hasDialog?='dialog' dialog=[dialog::Dialog] | hasUserFilter?='userFilter' | hasKeyBinding?='keyBinding')? ('{'
-		//subentries+=MenuEntry* '}')?
+		//'category' name=TRANSLATABLEID (hasTable?='table' table=[table::Table] | hasDialog?='dialog' dialog=[dialog::Dialog] |
+		//hasUserFilter?='userFilter' | hasReportPrinter?='reportPrinter' | hasKeyBinding?='keyBinding' |
+		//hasSystemSettings?='systemSettings' | '{' trees+=MenuTree* '}')?
 		public Group getGroup() { return cGroup; }
 		
-		//{MenuEntry}
-		public Action getMenuEntryAction_0() { return cMenuEntryAction_0; }
-		
-		//'entry'
-		public Keyword getEntryKeyword_1() { return cEntryKeyword_1; }
+		//'category'
+		public Keyword getCategoryKeyword_0() { return cCategoryKeyword_0; }
 		
-		//entryid=TRANSLATABLEID
-		public Assignment getEntryidAssignment_2() { return cEntryidAssignment_2; }
+		//name=TRANSLATABLEID
+		public Assignment getNameAssignment_1() { return cNameAssignment_1; }
 		
 		//TRANSLATABLEID
-		public RuleCall getEntryidTRANSLATABLEIDParserRuleCall_2_0() { return cEntryidTRANSLATABLEIDParserRuleCall_2_0; }
+		public RuleCall getNameTRANSLATABLEIDParserRuleCall_1_0() { return cNameTRANSLATABLEIDParserRuleCall_1_0; }
 		
-		//(description?='describedBy' descriptionValue=TRANSLATABLESTRING)?
-		public Group getGroup_3() { return cGroup_3; }
+		//(hasTable?='table' table=[table::Table] | hasDialog?='dialog' dialog=[dialog::Dialog] | hasUserFilter?='userFilter' |
+		//hasReportPrinter?='reportPrinter' | hasKeyBinding?='keyBinding' | hasSystemSettings?='systemSettings' | '{'
+		//trees+=MenuTree* '}')?
+		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 		
-		//description?='describedBy'
-		public Assignment getDescriptionAssignment_3_0() { return cDescriptionAssignment_3_0; }
+		//hasTable?='table' table=[table::Table]
+		public Group getGroup_2_0() { return cGroup_2_0; }
 		
-		//'describedBy'
-		public Keyword getDescriptionDescribedByKeyword_3_0_0() { return cDescriptionDescribedByKeyword_3_0_0; }
+		//hasTable?='table'
+		public Assignment getHasTableAssignment_2_0_0() { return cHasTableAssignment_2_0_0; }
 		
-		//descriptionValue=TRANSLATABLESTRING
-		public Assignment getDescriptionValueAssignment_3_1() { return cDescriptionValueAssignment_3_1; }
+		//'table'
+		public Keyword getHasTableTableKeyword_2_0_0_0() { return cHasTableTableKeyword_2_0_0_0; }
 		
-		//TRANSLATABLESTRING
-		public RuleCall getDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0() { return cDescriptionValueTRANSLATABLESTRINGParserRuleCall_3_1_0; }
+		//table=[table::Table]
+		public Assignment getTableAssignment_2_0_1() { return cTableAssignment_2_0_1; }
 		
-		//(hasImage?='image' image=STRING)?
-		public Group getGroup_4() { return cGroup_4; }
+		//[table::Table]
+		public CrossReference getTableTableCrossReference_2_0_1_0() { return cTableTableCrossReference_2_0_1_0; }
 		
-		//hasImage?='image'
-		public Assignment getHasImageAssignment_4_0() { return cHasImageAssignment_4_0; }
+		//ID
+		public RuleCall getTableTableIDTerminalRuleCall_2_0_1_0_1() { return cTableTableIDTerminalRuleCall_2_0_1_0_1; }
 		
-		//'image'
-		public Keyword getHasImageImageKeyword_4_0_0() { return cHasImageImageKeyword_4_0_0; }
+		//hasDialog?='dialog' dialog=[dialog::Dialog]
+		public Group getGroup_2_1() { return cGroup_2_1; }
 		
-		//image=STRING
-		public Assignment getImageAssignment_4_1() { return cImageAssignment_4_1; }
+		//hasDialog?='dialog'
+		public Assignment getHasDialogAssignment_2_1_0() { return cHasDialogAssignment_2_1_0; }
 		
-		//STRING
-		public RuleCall getImageSTRINGTerminalRuleCall_4_1_0() { return cImageSTRINGTerminalRuleCall_4_1_0; }
+		//'dialog'
+		public Keyword getHasDialogDialogKeyword_2_1_0_0() { return cHasDialogDialogKeyword_2_1_0_0; }
 		
-		//showBadge?='showBadge'?
-		public Assignment getShowBadgeAssignment_5() { return cShowBadgeAssignment_5; }
+		//dialog=[dialog::Dialog]
+		public Assignment getDialogAssignment_2_1_1() { return cDialogAssignment_2_1_1; }
 		
-		//'showBadge'
-		public Keyword getShowBadgeShowBadgeKeyword_5_0() { return cShowBadgeShowBadgeKeyword_5_0; }
+		//[dialog::Dialog]
+		public CrossReference getDialogDialogCrossReference_2_1_1_0() { return cDialogDialogCrossReference_2_1_1_0; }
 		
-		//(hasProcess?='process' process=[blip::Blip] | hasPerspective?='perspective' perspective=[perspective::Perspective] |
-		//hasTable?='table' table=[table::Table] | hasDialog?='dialog' dialog=[dialog::Dialog] | hasUserFilter?='userFilter' |
-		//hasKeyBinding?='keyBinding')?
-		public Alternatives getAlternatives_6() { return cAlternatives_6; }
+		//ID
+		public RuleCall getDialogDialogIDTerminalRuleCall_2_1_1_0_1() { return cDialogDialogIDTerminalRuleCall_2_1_1_0_1; }
 		
-		//hasProcess?='process' process=[blip::Blip]
-		public Group getGroup_6_0() { return cGroup_6_0; }
+		//hasUserFilter?='userFilter'
+		public Assignment getHasUserFilterAssignment_2_2() { return cHasUserFilterAssignment_2_2; }
 		
-		//hasProcess?='process'
-		public Assignment getHasProcessAssignment_6_0_0() { return cHasProcessAssignment_6_0_0; }
+		//'userFilter'
+		public Keyword getHasUserFilterUserFilterKeyword_2_2_0() { return cHasUserFilterUserFilterKeyword_2_2_0; }
 		
-		//'process'
-		public Keyword getHasProcessProcessKeyword_6_0_0_0() { return cHasProcessProcessKeyword_6_0_0_0; }
+		//hasReportPrinter?='reportPrinter'
+		public Assignment getHasReportPrinterAssignment_2_3() { return cHasReportPrinterAssignment_2_3; }
 		
-		//process=[blip::Blip]
-		public Assignment getProcessAssignment_6_0_1() { return cProcessAssignment_6_0_1; }
+		//'reportPrinter'
+		public Keyword getHasReportPrinterReportPrinterKeyword_2_3_0() { return cHasReportPrinterReportPrinterKeyword_2_3_0; }
 		
-		//[blip::Blip]
-		public CrossReference getProcessBlipCrossReference_6_0_1_0() { return cProcessBlipCrossReference_6_0_1_0; }
+		//hasKeyBinding?='keyBinding'
+		public Assignment getHasKeyBindingAssignment_2_4() { return cHasKeyBindingAssignment_2_4; }
 		
-		//ID
-		public RuleCall getProcessBlipIDTerminalRuleCall_6_0_1_0_1() { return cProcessBlipIDTerminalRuleCall_6_0_1_0_1; }
+		//'keyBinding'
+		public Keyword getHasKeyBindingKeyBindingKeyword_2_4_0() { return cHasKeyBindingKeyBindingKeyword_2_4_0; }
 		
-		//hasPerspective?='perspective' perspective=[perspective::Perspective]
-		public Group getGroup_6_1() { return cGroup_6_1; }
+		//hasSystemSettings?='systemSettings'
+		public Assignment getHasSystemSettingsAssignment_2_5() { return cHasSystemSettingsAssignment_2_5; }
 		
-		//hasPerspective?='perspective'
-		public Assignment getHasPerspectiveAssignment_6_1_0() { return cHasPerspectiveAssignment_6_1_0; }
+		//'systemSettings'
+		public Keyword getHasSystemSettingsSystemSettingsKeyword_2_5_0() { return cHasSystemSettingsSystemSettingsKeyword_2_5_0; }
 		
-		//'perspective'
-		public Keyword getHasPerspectivePerspectiveKeyword_6_1_0_0() { return cHasPerspectivePerspectiveKeyword_6_1_0_0; }
+		//'{' trees+=MenuTree* '}'
+		public Group getGroup_2_6() { return cGroup_2_6; }
 		
-		//perspective=[perspective::Perspective]
-		public Assignment getPerspectiveAssignment_6_1_1() { return cPerspectiveAssignment_6_1_1; }
+		//'{'
+		public Keyword getLeftCurlyBracketKeyword_2_6_0() { return cLeftCurlyBracketKeyword_2_6_0; }
 		
-		//[perspective::Perspective]
-		public CrossReference getPerspectivePerspectiveCrossReference_6_1_1_0() { return cPerspectivePerspectiveCrossReference_6_1_1_0; }
+		//trees+=MenuTree*
+		public Assignment getTreesAssignment_2_6_1() { return cTreesAssignment_2_6_1; }
 		
-		//ID
-		public RuleCall getPerspectivePerspectiveIDTerminalRuleCall_6_1_1_0_1() { return cPerspectivePerspectiveIDTerminalRuleCall_6_1_1_0_1; }
+		//MenuTree
+		public RuleCall getTreesMenuTreeParserRuleCall_2_6_1_0() { return cTreesMenuTreeParserRuleCall_2_6_1_0; }
 		
-		//hasTable?='table' table=[table::Table]
-		public Group getGroup_6_2() { return cGroup_6_2; }
+		//'}'
+		public Keyword getRightCurlyBracketKeyword_2_6_2() { return cRightCurlyBracketKeyword_2_6_2; }
+	}
+	public class MenuTreeElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.menu.MenuDsl.MenuTree");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword cTreeKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall cNameTRANSLATABLEIDParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+		private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
+		private final Assignment cHasTooltipAssignment_2_0 = (Assignment)cGroup_2.eContents().get(0);
+		private final Keyword cHasTooltipTooltipKeyword_2_0_0 = (Keyword)cHasTooltipAssignment_2_0.eContents().get(0);
+		private final Assignment cTooltipAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
+		private final RuleCall cTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0 = (RuleCall)cTooltipAssignment_2_1.eContents().get(0);
+		private final Keyword cLeftCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
+		private final Assignment cEntriesAssignment_4 = (Assignment)cGroup.eContents().get(4);
+		private final RuleCall cEntriesMenuEntryParserRuleCall_4_0 = (RuleCall)cEntriesAssignment_4.eContents().get(0);
+		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
+		
+		//MenuTree:
+		//	'tree' name=TRANSLATABLEID (hasTooltip?='tooltip' tooltip=TRANSLATABLESTRING)?
+		//	'{' entries+=MenuEntry* '}';
+		@Override public ParserRule getRule() { return rule; }
 		
-		//hasTable?='table'
-		public Assignment getHasTableAssignment_6_2_0() { return cHasTableAssignment_6_2_0; }
+		//'tree' name=TRANSLATABLEID (hasTooltip?='tooltip' tooltip=TRANSLATABLESTRING)? '{' entries+=MenuEntry* '}'
+		public Group getGroup() { return cGroup; }
 		
-		//'table'
-		public Keyword getHasTableTableKeyword_6_2_0_0() { return cHasTableTableKeyword_6_2_0_0; }
+		//'tree'
+		public Keyword getTreeKeyword_0() { return cTreeKeyword_0; }
 		
-		//table=[table::Table]
-		public Assignment getTableAssignment_6_2_1() { return cTableAssignment_6_2_1; }
+		//name=TRANSLATABLEID
+		public Assignment getNameAssignment_1() { return cNameAssignment_1; }
 		
-		//[table::Table]
-		public CrossReference getTableTableCrossReference_6_2_1_0() { return cTableTableCrossReference_6_2_1_0; }
+		//TRANSLATABLEID
+		public RuleCall getNameTRANSLATABLEIDParserRuleCall_1_0() { return cNameTRANSLATABLEIDParserRuleCall_1_0; }
 		
-		//ID
-		public RuleCall getTableTableIDTerminalRuleCall_6_2_1_0_1() { return cTableTableIDTerminalRuleCall_6_2_1_0_1; }
+		//(hasTooltip?='tooltip' tooltip=TRANSLATABLESTRING)?
+		public Group getGroup_2() { return cGroup_2; }
 		
-		//hasDialog?='dialog' dialog=[dialog::Dialog]
-		public Group getGroup_6_3() { return cGroup_6_3; }
+		//hasTooltip?='tooltip'
+		public Assignment getHasTooltipAssignment_2_0() { return cHasTooltipAssignment_2_0; }
 		
-		//hasDialog?='dialog'
-		public Assignment getHasDialogAssignment_6_3_0() { return cHasDialogAssignment_6_3_0; }
+		//'tooltip'
+		public Keyword getHasTooltipTooltipKeyword_2_0_0() { return cHasTooltipTooltipKeyword_2_0_0; }
 		
-		//'dialog'
-		public Keyword getHasDialogDialogKeyword_6_3_0_0() { return cHasDialogDialogKeyword_6_3_0_0; }
+		//tooltip=TRANSLATABLESTRING
+		public Assignment getTooltipAssignment_2_1() { return cTooltipAssignment_2_1; }
 		
-		//dialog=[dialog::Dialog]
-		public Assignment getDialogAssignment_6_3_1() { return cDialogAssignment_6_3_1; }
+		//TRANSLATABLESTRING
+		public RuleCall getTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0() { return cTooltipTRANSLATABLESTRINGParserRuleCall_2_1_0; }
 		
-		//[dialog::Dialog]
-		public CrossReference getDialogDialogCrossReference_6_3_1_0() { return cDialogDialogCrossReference_6_3_1_0; }
+		//'{'
+		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 		
-		//ID
-		public RuleCall getDialogDialogIDTerminalRuleCall_6_3_1_0_1() { return cDialogDialogIDTerminalRuleCall_6_3_1_0_1; }
+		//entries+=MenuEntry*
+		public Assignment getEntriesAssignment_4() { return cEntriesAssignment_4; }
 		
-		//hasUserFilter?='userFilter'
-		public Assignment getHasUserFilterAssignment_6_4() { return cHasUserFilterAssignment_6_4; }
+		//MenuEntry
+		public RuleCall getEntriesMenuEntryParserRuleCall_4_0() { return cEntriesMenuEntryParserRuleCall_4_0; }
 		
-		//'userFilter'
-		public Keyword getHasUserFilterUserFilterKeyword_6_4_0() { return cHasUserFilterUserFilterKeyword_6_4_0; }
+		//'}'
+		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
+	}
+	public class MenuEntryElements extends AbstractParserRuleElementFinder {
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.menu.MenuDsl.MenuEntry");
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword cEntryKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall cNameTRANSLATABLEIDParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+		private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
+		private final Assignment cHasIconAssignment_2_0 = (Assignment)cGroup_2.eContents().get(0);
+		private final Keyword cHasIconIconKeyword_2_0_0 = (Keyword)cHasIconAssignment_2_0.eContents().get(0);
+		private final Assignment cIconAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
+		private final RuleCall cIconSTRINGTerminalRuleCall_2_1_0 = (RuleCall)cIconAssignment_2_1.eContents().get(0);
+		private final Alternatives cAlternatives_3 = (Alternatives)cGroup.eContents().get(3);
+		private final Group cGroup_3_0 = (Group)cAlternatives_3.eContents().get(0);
+		private final Assignment cHasProcessAssignment_3_0_0 = (Assignment)cGroup_3_0.eContents().get(0);
+		private final Keyword cHasProcessProcessKeyword_3_0_0_0 = (Keyword)cHasProcessAssignment_3_0_0.eContents().get(0);
+		private final Assignment cProcessAssignment_3_0_1 = (Assignment)cGroup_3_0.eContents().get(1);
+		private final CrossReference cProcessBlipCrossReference_3_0_1_0 = (CrossReference)cProcessAssignment_3_0_1.eContents().get(0);
+		private final RuleCall cProcessBlipIDTerminalRuleCall_3_0_1_0_1 = (RuleCall)cProcessBlipCrossReference_3_0_1_0.eContents().get(1);
+		private final Group cGroup_3_1 = (Group)cAlternatives_3.eContents().get(1);
+		private final Assignment cHasPerspectiveAssignment_3_1_0 = (Assignment)cGroup_3_1.eContents().get(0);
+		private final Keyword cHasPerspectivePerspectiveKeyword_3_1_0_0 = (Keyword)cHasPerspectiveAssignment_3_1_0.eContents().get(0);
+		private final Assignment cPerspectiveAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);
+		private final CrossReference cPerspectivePerspectiveCrossReference_3_1_1_0 = (CrossReference)cPerspectiveAssignment_3_1_1.eContents().get(0);
+		private final RuleCall cPerspectivePerspectiveIDTerminalRuleCall_3_1_1_0_1 = (RuleCall)cPerspectivePerspectiveCrossReference_3_1_1_0.eContents().get(1);
 		
-		//hasKeyBinding?='keyBinding'
-		public Assignment getHasKeyBindingAssignment_6_5() { return cHasKeyBindingAssignment_6_5; }
+		//MenuEntry:
+		//	'entry' name=TRANSLATABLEID (hasIcon?='icon' icon=STRING)? (hasProcess?='process' process=[blip::Blip] |
+		//	hasPerspective?='perspective' perspective=[perspective::Perspective]);
+		@Override public ParserRule getRule() { return rule; }
 		
-		//'keyBinding'
-		public Keyword getHasKeyBindingKeyBindingKeyword_6_5_0() { return cHasKeyBindingKeyBindingKeyword_6_5_0; }
+		//'entry' name=TRANSLATABLEID (hasIcon?='icon' icon=STRING)? (hasProcess?='process' process=[blip::Blip] |
+		//hasPerspective?='perspective' perspective=[perspective::Perspective])
+		public Group getGroup() { return cGroup; }
 		
-		//('{' subentries+=MenuEntry* '}')?
-		public Group getGroup_7() { return cGroup_7; }
+		//'entry'
+		public Keyword getEntryKeyword_0() { return cEntryKeyword_0; }
 		
-		//'{'
-		public Keyword getLeftCurlyBracketKeyword_7_0() { return cLeftCurlyBracketKeyword_7_0; }
+		//name=TRANSLATABLEID
+		public Assignment getNameAssignment_1() { return cNameAssignment_1; }
 		
-		//subentries+=MenuEntry*
-		public Assignment getSubentriesAssignment_7_1() { return cSubentriesAssignment_7_1; }
+		//TRANSLATABLEID
+		public RuleCall getNameTRANSLATABLEIDParserRuleCall_1_0() { return cNameTRANSLATABLEIDParserRuleCall_1_0; }
 		
-		//MenuEntry
-		public RuleCall getSubentriesMenuEntryParserRuleCall_7_1_0() { return cSubentriesMenuEntryParserRuleCall_7_1_0; }
+		//(hasIcon?='icon' icon=STRING)?
+		public Group getGroup_2() { return cGroup_2; }
 		
-		//'}'
-		public Keyword getRightCurlyBracketKeyword_7_2() { return cRightCurlyBracketKeyword_7_2; }
+		//hasIcon?='icon'
+		public Assignment getHasIconAssignment_2_0() { return cHasIconAssignment_2_0; }
+		
+		//'icon'
+		public Keyword getHasIconIconKeyword_2_0_0() { return cHasIconIconKeyword_2_0_0; }
+		
+		//icon=STRING
+		public Assignment getIconAssignment_2_1() { return cIconAssignment_2_1; }
+		
+		//STRING
+		public RuleCall getIconSTRINGTerminalRuleCall_2_1_0() { return cIconSTRINGTerminalRuleCall_2_1_0; }
+		
+		//hasProcess?='process' process=[blip::Blip] | hasPerspective?='perspective' perspective=[perspective::Perspective]
+		public Alternatives getAlternatives_3() { return cAlternatives_3; }
+		
+		//hasProcess?='process' process=[blip::Blip]
+		public Group getGroup_3_0() { return cGroup_3_0; }
+		
+		//hasProcess?='process'
+		public Assignment getHasProcessAssignment_3_0_0() { return cHasProcessAssignment_3_0_0; }
+		
+		//'process'
+		public Keyword getHasProcessProcessKeyword_3_0_0_0() { return cHasProcessProcessKeyword_3_0_0_0; }
+		
+		//process=[blip::Blip]
+		public Assignment getProcessAssignment_3_0_1() { return cProcessAssignment_3_0_1; }
+		
+		//[blip::Blip]
+		public CrossReference getProcessBlipCrossReference_3_0_1_0() { return cProcessBlipCrossReference_3_0_1_0; }
+		
+		//ID
+		public RuleCall getProcessBlipIDTerminalRuleCall_3_0_1_0_1() { return cProcessBlipIDTerminalRuleCall_3_0_1_0_1; }
+		
+		//hasPerspective?='perspective' perspective=[perspective::Perspective]
+		public Group getGroup_3_1() { return cGroup_3_1; }
+		
+		//hasPerspective?='perspective'
+		public Assignment getHasPerspectiveAssignment_3_1_0() { return cHasPerspectiveAssignment_3_1_0; }
+		
+		//'perspective'
+		public Keyword getHasPerspectivePerspectiveKeyword_3_1_0_0() { return cHasPerspectivePerspectiveKeyword_3_1_0_0; }
+		
+		//perspective=[perspective::Perspective]
+		public Assignment getPerspectiveAssignment_3_1_1() { return cPerspectiveAssignment_3_1_1; }
+		
+		//[perspective::Perspective]
+		public CrossReference getPerspectivePerspectiveCrossReference_3_1_1_0() { return cPerspectivePerspectiveCrossReference_3_1_1_0; }
+		
+		//ID
+		public RuleCall getPerspectivePerspectiveIDTerminalRuleCall_3_1_1_0_1() { return cPerspectivePerspectiveIDTerminalRuleCall_3_1_1_0_1; }
 	}
 	public class TRANSLATABLESTRINGElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.osbp.xtext.menu.MenuDsl.TRANSLATABLESTRING");
@@ -429,6 +480,8 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 	
 	private final MenuModelElements pMenuModel;
 	private final MenuPackageElements pMenuPackage;
+	private final MenuCategoryElements pMenuCategory;
+	private final MenuTreeElements pMenuTree;
 	private final MenuEntryElements pMenuEntry;
 	private final TRANSLATABLESTRINGElements pTRANSLATABLESTRING;
 	private final TRANSLATABLEIDElements pTRANSLATABLEID;
@@ -456,6 +509,8 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 		this.gaXtype = gaXtype;
 		this.pMenuModel = new MenuModelElements();
 		this.pMenuPackage = new MenuPackageElements();
+		this.pMenuCategory = new MenuCategoryElements();
+		this.pMenuTree = new MenuTreeElements();
 		this.pMenuEntry = new MenuEntryElements();
 		this.pTRANSLATABLESTRING = new TRANSLATABLESTRINGElements();
 		this.pTRANSLATABLEID = new TRANSLATABLEIDElements();
@@ -502,7 +557,7 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 	
 	//MenuModel:
 	//	importSection=XImportSection?
-	//	packages+=MenuPackage*;
+	//	menupackage=MenuPackage;
 	public MenuModelElements getMenuModelAccess() {
 		return pMenuModel;
 	}
@@ -512,11 +567,10 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 	}
 	
 	//MenuPackage:
-	//	{MenuPackage} 'package' name=QualifiedName ('{'
-	//	'expandedImage' expandedImage=STRING 'collapsedImage' collapsedImage=STRING
-	//	subMenuIsAccordion?='accordionSubmenu'? ('height' height=STRING)? ('width' width=STRING)?
+	//	{MenuPackage} 'package' name=QualifiedName ('expandedImage' expandedImage=STRING 'collapsedImage'
+	//	collapsedImage=STRING ('height' height=STRING)? ('width' width=STRING)?
 	//	hasDesigner?='designer'?
-	//	entries+=MenuEntry* '}')?;
+	//	categories+=MenuCategory*)?;
 	public MenuPackageElements getMenuPackageAccess() {
 		return pMenuPackage;
 	}
@@ -525,13 +579,33 @@ public class MenuDslGrammarAccess extends AbstractGrammarElementFinder {
 		return getMenuPackageAccess().getRule();
 	}
 	
+	//MenuCategory:
+	//	'category' name=TRANSLATABLEID (hasTable?='table' table=[table::Table] | hasDialog?='dialog' dialog=[dialog::Dialog] |
+	//	hasUserFilter?='userFilter' | hasReportPrinter?='reportPrinter' | hasKeyBinding?='keyBinding' |
+	//	hasSystemSettings?='systemSettings' |
+	//	'{' trees+=MenuTree* '}')?;
+	public MenuCategoryElements getMenuCategoryAccess() {
+		return pMenuCategory;
+	}
+	
+	public ParserRule getMenuCategoryRule() {
+		return getMenuCategoryAccess().getRule();
+	}
+	
+	//MenuTree:
+	//	'tree' name=TRANSLATABLEID (hasTooltip?='tooltip' tooltip=TRANSLATABLESTRING)?
+	//	'{' entries+=MenuEntry* '}';
+	public MenuTreeElements getMenuTreeAccess() {
+		return pMenuTree;
+	}
+	
+	public ParserRule getMenuTreeRule() {
+		return getMenuTreeAccess().getRule();
+	}
+	
 	//MenuEntry:
-	//	{MenuEntry} 'entry' entryid=TRANSLATABLEID (description?='describedBy' descriptionValue=TRANSLATABLESTRING)?
-	//	(hasImage?='image' image=STRING)?
-	//	showBadge?='showBadge'? (hasProcess?='process' process=[blip::Blip] | hasPerspective?='perspective'
-	//	perspective=[perspective::Perspective] | hasTable?='table' table=[table::Table] | hasDialog?='dialog'
-	//	dialog=[dialog::Dialog] | hasUserFilter?='userFilter' | hasKeyBinding?='keyBinding')? ('{' subentries+=MenuEntry*
-	//	'}')?;
+	//	'entry' name=TRANSLATABLEID (hasIcon?='icon' icon=STRING)? (hasProcess?='process' process=[blip::Blip] |
+	//	hasPerspective?='perspective' perspective=[perspective::Perspective]);
 	public MenuEntryElements getMenuEntryAccess() {
 		return pMenuEntry;
 	}
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/Activator.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/Activator.java
index 6cb75f6..d090a1c 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/Activator.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/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.menu/src/org/eclipse/osbp/xtext/menu/GenerateMenuDsl.mwe2 b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/GenerateMenuDsl.mwe2
index 4c1e816..b5cd4c5 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/GenerateMenuDsl.mwe2
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/GenerateMenuDsl.mwe2
@@ -1,9 +1,11 @@
 /* 
  * Copyright (c) 2014,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:  
  *		Loetz GmbH&Co.KG - Initial implementation 
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceRuntimeModule.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceRuntimeModule.java
index 1886376..0ddc7f9 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceRuntimeModule.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceRuntimeModule.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.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceStandaloneSetup.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceStandaloneSetup.java
index 6b79c37..31d26f8 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceStandaloneSetup.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDSLBundleSpaceStandaloneSetup.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.menu/src/org/eclipse/osbp/xtext/menu/MenuDsl.xtext b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDsl.xtext
index 7fe28b4..beff573 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDsl.xtext
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDsl.xtext
@@ -1,9 +1,11 @@
 /* 
  * Copyright (c) 2014,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:  
  *		Loetz GmbH&Co.KG - Initial implementation 
@@ -20,33 +22,36 @@ import "http://osbp.eclipse.org/xtext/dialogdsl/DialogDSL" as dialog
 
 MenuModel:
 	importSection=XImportSection?
-	packages+=MenuPackage*;
+	menupackage=MenuPackage;
 
 MenuPackage:
 	{MenuPackage} 'package' name=QualifiedName
-	('{' 
-		'expandedImage' expandedImage=STRING 'collapsedImage' collapsedImage=STRING 
-		(subMenuIsAccordion?='accordionSubmenu')?
-		('height' height=STRING)?
-		('width' width=STRING)?
-		(hasDesigner?='designer')?
-		(entries+=MenuEntry)* '}'
-	)?;
-
-MenuEntry:
-	{MenuEntry} 'entry' entryid=TRANSLATABLEID 
-	(description?='describedBy' descriptionValue=TRANSLATABLESTRING)?
-	(hasImage?='image' image=STRING)?
-	(showBadge?='showBadge')?
-	(
-		(hasProcess?='process' process=[blip::Blip]) | 
-		(hasPerspective?='perspective' perspective=[perspective::Perspective]) |
-		(hasTable?='table' table=[table::Table]) | 
-		(hasDialog?='dialog' dialog=[dialog::Dialog]) |
-		(hasUserFilter?='userFilter') |
-		(hasKeyBinding?='keyBinding')
-	)?
-	('{' (subentries+=MenuEntry)* '}')?;
+	('expandedImage' expandedImage=STRING 'collapsedImage' collapsedImage=STRING 
+	('height' height=STRING)?
+	('width' width=STRING)?
+	(hasDesigner?='designer')?
+	(categories+=MenuCategory)*)?;
+
+MenuCategory:
+	'category' name=TRANSLATABLEID
+	(hasTable?='table' table=[table::Table] | 
+	hasDialog?='dialog' dialog=[dialog::Dialog] |
+	hasUserFilter?='userFilter' |
+	hasReportPrinter?='reportPrinter' |
+	hasKeyBinding?='keyBinding' |
+	hasSystemSettings?='systemSettings' |
+	'{' trees+=MenuTree* '}')?; 
+
+MenuTree:
+	'tree' name=TRANSLATABLEID
+	(hasTooltip?='tooltip' tooltip=TRANSLATABLESTRING)?
+	'{' entries+=MenuEntry* '}';
+
+MenuEntry: 
+	'entry' name=TRANSLATABLEID 
+	(hasIcon?='icon' icon=STRING)?
+	(hasProcess?='process' process=[blip::Blip] | 
+	hasPerspective?='perspective' perspective=[perspective::Perspective]);
 
 TRANSLATABLESTRING:
 	STRING;
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDslRuntimeModule.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDslRuntimeModule.java
index 4c57c2c..c5d5952 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDslRuntimeModule.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDslRuntimeModule.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.menu/src/org/eclipse/osbp/xtext/menu/MenuDslStandaloneSetup.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDslStandaloneSetup.java
index 5f3af38..569e93b 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDslStandaloneSetup.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/MenuDslStandaloneSetup.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.menu/src/org/eclipse/osbp/xtext/menu/XcoreResourceFactory.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/XcoreResourceFactory.java
index 6b3012b..ec91b81 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/XcoreResourceFactory.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/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.menu/src/org/eclipse/osbp/xtext/menu/common/UserMenuItem.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/common/UserMenuItem.java
index 4631c14..9487199 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/common/UserMenuItem.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/common/UserMenuItem.java
@@ -3,51 +3,77 @@
  *  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
  * 
  */
- package org.eclipse.osbp.xtext.menu.common;
+package org.eclipse.osbp.xtext.menu.common;
+
+import java.util.Locale;
+
+import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService;
 
 public class UserMenuItem {
-	static public enum UserMenuItemType {NONE, PROCESS, PERSPECTIVE, USERFILTER}
-	
+	public enum UserMenuItemType {
+		NONE, PROCESS, PERSPECTIVE, USERFILTER
+	}
+
 	private UserMenuItemType type;
 	private String id;
 	private String callId;
 	private String i18nId;
-	
-	public UserMenuItem(String id, String callId, UserMenuItemType type) {
+	private String description;
+	private String i18nDescription;
+	private IDSLMetadataService dslMetadataService;
+	private String iconName;
+
+	public UserMenuItem(IDSLMetadataService dslMetadataService, String id, String callId, UserMenuItemType type, String description, String iconName) {
+		this.dslMetadataService = dslMetadataService;
 		this.id = id;
 		this.callId = callId;
 		this.type = type;
+		this.description = description;
+		this.iconName = iconName;
+	}
+
+	public void setLocale(Locale locale) {
+		i18nId = dslMetadataService.translate(locale.toLanguageTag(), id);
+		i18nDescription = dslMetadataService.translate(locale.toLanguageTag(), description);
 	}
+
 	public UserMenuItemType getType() {
 		return type;
 	}
-	public void setType(UserMenuItemType type) {
-		this.type = type;
-	}
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
+
 	public String getCallId() {
 		return callId;
 	}
-	public void setCallId(String callId) {
-		this.callId = callId;
-	}
-	public void setI18nId(String i18nId) {
-		this.i18nId = i18nId;
-	}
+
 	public String toString() {
 		return i18nId;
 	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public String getIconName() {
+		return iconName;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getI18nDescription() {
+		return i18nDescription;
+	}
+	
+	
 }
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.xtend b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.xtend
index b5073d4..898f2f2 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.xtend
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.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.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.xtend b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.xtend
index 1dd8249..3337695 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.xtend
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.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
@@ -63,6 +65,7 @@ import org.slf4j.Logger
 import org.vaadin.hene.popupbutton.PopupButton
 import org.vaadin.hene.popupbutton.PopupButton.PopupVisibilityEvent
 import org.vaadin.hene.popupbutton.PopupButton.PopupVisibilityListener
+import org.eclipse.osbp.xtext.menu.MenuCategory
 
 class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 	@Inject extension JvmTypesBuilder
@@ -77,7 +80,7 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 	var flagTreeMenu = false
 	
    	def dispatch void infer(MenuPackage pkg, IJvmDeclaredTypeAcceptor acceptor, boolean isPreIndexingPhase) {
-		clsName = pkg.eResource.URI.lastSegment.replace("."+fileExtension,"")+fileExtension.toFirstUpper
+		clsName = pkg.eResource.URI.lastSegment.replace("."+fileExtension,"").toFirstUpper+fileExtension.toFirstUpper
 		val cls = pkg.toClass(pkg.name+"."+clsName)
         cls.superTypes.add(_typeReferenceBuilder.typeRef(IUserMenuProvider))
 		cls.superTypes.add(_typeReferenceBuilder.typeRef(IUser.UserLocaleListener))
@@ -126,20 +129,20 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 	}
 
 	def void toInjectedFields(JvmDeclaredType type, MenuPackage pkg) {
-		for(entry:pkg.entries) {
-			entry.iterateFieldEntry(type, pkg)
-		}
+		pkg.categories.forEach[
+			it.createInjects(type, pkg)
+		]
 	}
 	
-	def void iterateFieldEntry(MenuEntry entry, JvmDeclaredType type, MenuPackage pkg) {
+	def void createInjects(MenuCategory category, JvmDeclaredType type, MenuPackage pkg) {
 		var JvmField field = null
-		if(entry.hasTable || entry.hasDialog) {
+		if(category.hasTable || category.hasDialog) {
 			var name = ""
 			var list = <String>newArrayList
-			if (entry.hasTable) {
-				name = entry.table.name
-			} else if(entry.hasDialog) {
-				name = entry.dialog.name
+			if (category.hasTable) {
+				name = category.table.name
+			} else if(category.hasDialog) {
+				name = category.dialog.name
 			}
 			if	((name !== null) && !name.isEmpty) {
 				list.add(name.toFirstUpper)
@@ -152,11 +155,6 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 				}
 			}
 		}
-		if(entry.subentries !== null && entry.subentries.size > 0) {
-			for(e:entry.subentries) {
-				e.iterateFieldEntry(type, pkg)
-			}
-		}
 	}
 	
 	def void toConstructor(JvmDeclaredType type, MenuPackage pkg) {
@@ -213,8 +211,6 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 		field = pkg.toField("downloadText", _typeReferenceBuilder.typeRef(String))
 		type.members += field
 		
-		field = pkg.toField("blipSuccessful", _typeReferenceBuilder.typeRef(boolean))
-		type.members += field
 		field = pkg.toField("context", _typeReferenceBuilder.typeRef(IEclipseContext))[
 			annotations += _annotationTypesBuilder.annotationRef(Inject)]
 		type.members += field
@@ -233,7 +229,7 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 		type.members += field
 		field = pkg.toField("downloadPerspectiveHandler", _typeReferenceBuilder.typeRef(IMenuItemHandler))[annotations += _annotationTypesBuilder.annotationRef(Inject) annotations += _annotationTypesBuilder.annotationRef(Optional) annotations += _annotationTypesBuilder.annotationRef(Named, "DownloadPerspectiveHandler")]
 		type.members += field
-		field = pkg.toField("blip", _typeReferenceBuilder.typeRef(IBlipBPMFunctionProvider)) [annotations += _annotationTypesBuilder.annotationRef(Inject) annotations += _annotationTypesBuilder.annotationRef(Named, "Blip")]
+		field = pkg.toField("blip", _typeReferenceBuilder.typeRef(IBlipBPMFunctionProvider)) [annotations += _annotationTypesBuilder.annotationRef(Inject)]
 		type.members += field
 		field = pkg.toField("tabs",
 			_typeReferenceBuilder.typeRef(HashMap, _typeReferenceBuilder.typeRef(TabSheet.Tab), _typeReferenceBuilder.typeRef(Pair, _typeReferenceBuilder.typeRef(String), _typeReferenceBuilder.typeRef(String))))
@@ -245,6 +241,10 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 		type.members += field
 		field = pkg.toField("keyBinding", _typeReferenceBuilder.typeRef(IVaadinDialogProvider)) [annotations += _annotationTypesBuilder.annotationRef(Inject) annotations += _annotationTypesBuilder.annotationRef(Named, "KeyBindingDialog")]
 		type.members += field
+		field = pkg.toField("systemSettings", _typeReferenceBuilder.typeRef(IVaadinDialogProvider)) [annotations += _annotationTypesBuilder.annotationRef(Inject) annotations += _annotationTypesBuilder.annotationRef(Named, "SystemSettings")]
+		type.members += field
+		field = pkg.toField("reportPrinter", _typeReferenceBuilder.typeRef(IVaadinDialogProvider)) [annotations += _annotationTypesBuilder.annotationRef(Inject) annotations += _annotationTypesBuilder.annotationRef(Named, "ReportPrinterDialog")]
+		type.members += field
 		field = pkg.toField("executorService", _typeReferenceBuilder.typeRef(VaadinExecutorService)) [annotations += _annotationTypesBuilder.annotationRef(Inject)]
 		type.members += field
 		field = pkg.toField("enabledUpdaters", _typeReferenceBuilder.typeRef(HashMap, _typeReferenceBuilder.typeRef(MenuBar.MenuItem), _typeReferenceBuilder.typeRef(Runnable)))[setInitializer([append('''new HashMap<>()''')])]
@@ -299,7 +299,7 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 					unregisterEnablementUpdaters();
 				}''')]
 			])
-		// registerEnabalementUpdaters
+		// registerEnablementUpdaters
 		type.members += pkg.toMethod("registerEnablementUpdaters", _typeReferenceBuilder.typeRef(Void::TYPE),
 			[
 				visibility = JvmVisibility.PUBLIC
@@ -339,7 +339,6 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
    	
    	def init(MenuPackage pkg)
    		'''
-		blipSuccessful = blip.initBlip();
 		bpmnWindow = new BpmnWindow(bpmEngine, blip, context);
 		tabs = new HashMap<>();
 		items = new HashMap<>();
@@ -358,6 +357,7 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 		'''
 		selectedMap = new HashMap<Accordion,Component>();
 		VerticalLayout tabRoot = new VerticalLayout();
+		tabRoot.setSizeFull();
 		«IF pkg.hasDesigner»
 		if (designModeHandler != null && userAccessService.isSuperuser()) {
 			MenuBar menubar = new MenuBar();
@@ -402,125 +402,110 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 			}));
 		}
 		«ENDIF»
-		«pkg.entries.iterateEntries("Root", 0, pkg)»
+		«pkg.createRootMenu»
 		return tabRoot;
 		'''
 	
-	def String iterateEntries(EList <MenuEntry> entries, String parentName, int depth, MenuPackage pkg)
-		'''
-		// start depth: «depth»
-		«IF pkg.subMenuIsAccordion || depth == 0»
-			Accordion acc«parentName» = new Accordion();
-			«IF pkg.height !== null»acc«parentName».setHeight("«pkg.height»");«ENDIF»
-			acc«parentName».setWidth(«IF pkg.width !== null»"«pkg.width»"«ELSE»"400px"«ENDIF»);
-			acc«parentName».addStyleName("os-accordion-level«depth»");
-			«selectedHandler('''acc«parentName»''')»
-			tab«parentName».addComponent(acc«parentName»);
-			«FOR entry:entries»
-				«IF entry.hasUserFilter»if (userAccessService.isSuperuser()) {«ENDIF»
-				VerticalLayout tab«entry.entryid.toFirstUpper» = new VerticalLayout();
-				«IF entry.hasTable»
-					«entry.table.name.toFirstLower».createView(tab«entry.entryid.toFirstUpper»);
-					tab«entry.entryid.toFirstUpper».setData(«entry.table.name.toFirstLower»);
-				«ELSEIF entry.hasDialog»
-					«entry.dialog.name.toFirstLower».createView(tab«entry.entryid.toFirstUpper»);
-					tab«entry.entryid.toFirstUpper».setData(«entry.dialog.name.toFirstLower»);
-				«ELSEIF entry.hasUserFilter»
-					userFilter.createView(tab«entry.entryid.toFirstUpper»);
-				«ELSEIF entry.hasKeyBinding»
-					keyBinding.createView(tab«entry.entryid.toFirstUpper»);
-				«ELSE»
-					«entry.iterateTabs(depth, pkg, null)»
-				«ENDIF»
-				acc«parentName».addTab(tab«entry.entryid.toFirstUpper», "«entry.entryid»", themeResourceService.getThemeResource("«pkg.collapsedImage»", ThemeResourceType.ICON));
-				tabs.put(acc«parentName».getTab(tab«entry.entryid.toFirstUpper»), new Pair("«entry.entryid»","«entry.descriptionValue»"));
-				«IF entry.hasUserFilter»}«ENDIF»
-			«ENDFOR»
-			selectedMap.put(acc«parentName», acc«parentName».getSelectedTab());
-		«ELSE»
-«««			«IF depth == 1 && !flagTreeMenu»
-«««			«IF depth == 1»
-«««				Tree tree«parentName» = new Tree();
-«««				tree«parentName».setWidth("300px");
-«««				tree«parentName».addStyleName("os-menutree-level«depth»");
-«««				tree«parentName».setImmediate(«flagTreeMenu = true»);
-«««				«valueChangeHandler('''tree«parentName»''')»
-«««				tab«parentName».addComponent(tree«parentName»);
-«««			«ENDIF»
-			«FOR entry:entries»
-				// tree for «var entryIdName = entry.entryid.toFirstUpper»
-				Tree tree«parentName»«entryIdName» = new Tree();
-				tree«parentName»«entryIdName».setWidth("300px");
-				tree«parentName»«entryIdName».addStyleName("os-menutree-level«depth»");
-				tree«parentName»«entryIdName».setImmediate(«flagTreeMenu = true»);
-				«valueChangeHandler('''tree«parentName»«entryIdName»''')»
-				tab«parentName».addComponent(tree«parentName»«entryIdName»);
-				«IF entry.hasTable»
-					«binderClassName».get«entry.table.name.toFirstUpper»().createView(tab«entry.entryid.toFirstUpper»);
-				«ELSEIF entry.hasDialog»
-					«binderClassName».get«entry.dialog.name.toFirstUpper»().createView(tab«entry.entryid.toFirstUpper»);
-				«ELSEIF entry.hasUserFilter»
-					«binderClassName».getUserFilter().createView(tab«entry.entryid.toFirstUpper»);
-				«ELSE»
-					«entry.iterateMenu(null, depth, pkg, '''tree«parentName»«entryIdName»''')»
-				«ENDIF»
-			«ENDFOR»
-		«ENDIF»
-		// end depth: «depth»
-		'''
-
-	def String iterateMenu(MenuEntry entry, MenuEntry root, int depth, MenuPackage pkg, String treeName)
+	def String createRootMenu(MenuPackage pkg)
 		'''
-		«IF entry.hasProcess»
-			if (bpmEngine != null && userAccessService.isGranted(Group.PROCESS, Action.STARTABLE, "«entry.process.name»")) {
-				UserMenuItem «treeName»«entry.entryid» = new UserMenuItem("«entry.entryid»", "«entry.process.name»", UserMenuItemType.PROCESS);
-				items.put(«treeName»«entry.entryid», "«entry.entryid»");
-				«treeName».addItem(«treeName»«entry.entryid»);
-				«IF depth > 1 && root !== null»
-					«treeName».setParent(«treeName»«entry.entryid», «treeName»«root.entryid»);
-				«ENDIF»
-				«IF entry.subentries !== null && entry.subentries.size > 0»
-					«treeName».setChildrenAllowed(«treeName»«entry.entryid», true);
-				«ELSE»
-					«treeName».setChildrenAllowed(«treeName»«entry.entryid», false);
-				«ENDIF»
+		ItemDescriptionGenerator generator = new ItemDescriptionGenerator() {                             
+			public String generateDescription(Component source, Object itemId, Object propertyId) {
+			    return ((UserMenuItem)itemId).getI18nDescription();
 			}
-		«ELSEIF entry.hasUserFilter»
-			// userFilter
-			if (userAccessService.isSuperuser()) {
-				UserMenuItem «treeName»«entry.entryid»  = new UserMenuItem(«treeName»«entry.entryid» , "", UserMenuItemType.USERFILTER);  
-				items.put(«treeName»«entry.entryid», "«treeName»«entry.entryid»");
-				treeTasks.addItem(«treeName»«entry.entryid»);
-				treeTasks.setParent(«treeName»«entry.entryid», «treeName»«root.entryid»);
-				treeTasks.setChildrenAllowed(«treeName»«entry.entryid», false);
+		};
+		ValueChangeListener valueChangeListener = new ValueChangeListener() {
+			@Override
+			public void valueChange(ValueChangeEvent event) {
+				UserMenuItem item = (UserMenuItem) ((Tree)event.getProperty()).getValue();
+				if(item != null) {
+					if(item.getType() == UserMenuItemType.PROCESS) {
+						bpmnWindow.showBpmn(item.getCallId());
+					} 
+					else if(item.getType() == UserMenuItemType.PERSPECTIVE) {
+						bpmnWindow.closeBpmn();
+						log.debug("start perspective "+item.getCallId());
+						perspectiveProvider.openPerspective(item.getCallId());
+					}
+					((Tree)event.getProperty()).select(null);
+				}
+				EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.CLOSE, "UserMenu", "«pkg.fullyQualifiedName.toString»");
+				eventDispatcher.sendEvent(evnt);
 			}
-		«ELSE»
-			UserMenuItem «treeName»«entry.entryid» = new UserMenuItem("«entry.entryid»", «IF entry.hasProcess»"«entry.process.name»"«ELSEIF entry.hasPerspective»"«entry.perspective.fullyQualifiedName»"«ELSE»""«ENDIF», UserMenuItemType.«IF entry.hasProcess»PROCESS«ELSEIF entry.hasPerspective»PERSPECTIVE«ELSE»NONE«ENDIF»);  
-			items.put(«treeName»«entry.entryid», "«entry.entryid»");
-			«treeName».addItem(«treeName»«entry.entryid»);
-			«IF depth > 1 && root !== null»
-				«treeName».setParent(«treeName»«entry.entryid», «treeName»«root.entryid»);
-			«ENDIF»
-			«IF entry.subentries !== null && entry.subentries.size > 0»
-				«treeName».setChildrenAllowed(«treeName»«entry.entryid», true);
+		};
+		Accordion accordion = new Accordion();
+		tabRoot.addComponent(accordion);
+		«IF pkg.height !== null»accordion.setHeight("«pkg.height»");«ENDIF»
+		accordion.setWidth(«IF pkg.width !== null»"«pkg.width»"«ELSE»"400px"«ENDIF»);
+		accordion.addStyleName("os-accordion-level0");
+		«selectedHandler("accordion")»
+
+		«FOR category:pkg.categories»
+			«IF category.hasUserFilter»
+			if(userAccessService.isSuperuser()) {
 			«ELSE»
-				«treeName».setChildrenAllowed(«treeName»«entry.entryid», false);
+			if(true) {
 			«ENDIF»
-		«ENDIF»
-		«FOR e:entry.subentries»
-			«e.iterateMenu(entry, depth+1, pkg, treeName)»
+				VerticalLayout tab«category.name.toFirstUpper» = new VerticalLayout();
+				Tree category«category.name.toFirstUpper» = new Tree();
+				if(dslMetadataService.isOsbee()) {
+					category«category.name.toFirstUpper».setDragMode(TreeDragMode.NODE);
+				}
+				category«category.name.toFirstUpper».addValueChangeListener(valueChangeListener);
+				category«category.name».setItemDescriptionGenerator(generator);
+				tab«category.name.toFirstUpper».addComponent(category«category.name.toFirstUpper»);
+				category«category.name.toFirstUpper».setWidth(«IF pkg.width !== null»"«pkg.width»"«ELSE»"400px"«ENDIF»);
+				category«category.name.toFirstUpper».addStyleName("os-menutree-level0");
+				accordion.addTab(tab«category.name.toFirstUpper», "«category.name»", themeResourceService.getThemeResource("«pkg.collapsedImage»", ThemeResourceType.ICON));
+				tabs.put(accordion.getTab(tab«category.name.toFirstUpper»), new Pair("«category.name»",""));
+				«IF category.hasTable»
+					«category.table.name.toFirstLower».createView(tab«category.name.toFirstUpper»);
+					tab«category.name.toFirstUpper».setData(«category.table.name.toFirstLower»);
+				«ELSEIF category.hasDialog»
+					«category.dialog.name.toFirstLower».createView(tab«category.name.toFirstUpper»);
+					tab«category.name.toFirstUpper».setData(«category.dialog.name.toFirstLower»);
+				«ELSEIF category.hasUserFilter»
+					userFilter.createView(tab«category.name.toFirstUpper»);
+				«ELSEIF category.hasKeyBinding»
+					keyBinding.createView(tab«category.name.toFirstUpper»);
+				«ELSEIF category.hasSystemSettings»
+					systemSettings.createView(tab«category.name.toFirstUpper»);
+				«ELSEIF category.hasReportPrinter»
+					reportPrinter.createView(tab«category.name.toFirstUpper»);
+				«ENDIF»
+				«FOR tree:category.trees»
+					UserMenuItem «tree.name» = new UserMenuItem(dslMetadataService, "«tree.name»", "«tree.name»", UserMenuItemType.NONE, "«tree.tooltip»", null);
+					items.put(«tree.name», "«tree.name»");
+					category«category.name.toFirstUpper».addItem(«tree.name»);
+					category«category.name.toFirstUpper».setChildrenAllowed(«tree.name», true);
+					«FOR entry:tree.entries»
+						«IF entry.hasProcess»
+						if(bpmEngine != null && userAccessService.isGranted(Group.PROCESS, Action.STARTABLE, "«entry.process.name»")) {
+						«ELSE»
+						if(true) {
+						«ENDIF»
+							UserMenuItem «tree.name»«entry.name» = new UserMenuItem(dslMetadataService, "«entry.name»", 
+							«IF entry.hasProcess»"«entry.process.name»"
+							«ELSEIF entry.hasPerspective»"«entry.perspective.fullyQualifiedName»"
+							«ELSE»""
+							«ENDIF», UserMenuItemType.«IF entry.hasProcess»PROCESS, "«entry.process.descriptionValue»"
+							«ELSEIF entry.hasPerspective»PERSPECTIVE, "«entry.perspective.descriptionValue»"«
+							ELSE»NONE, ""
+							«ENDIF», "«entry.icon»");
+							items.put(«tree.name»«entry.name», "«entry.name»");
+							category«category.name.toFirstUpper».addItem(«tree.name»«entry.name»);
+							category«category.name.toFirstUpper».setParent(«tree.name»«entry.name», «tree.name»);
+							category«category.name.toFirstUpper».setChildrenAllowed(«tree.name»«entry.name», false);
+							«IF entry.hasIcon»
+							category«category.name.toFirstUpper».setItemIcon(«tree.name»«entry.name», themeResourceService.getThemeResource("«entry.icon»", ThemeResourceType.ICON));
+							«ENDIF»
+						}
+						
+					«ENDFOR»
+				«ENDFOR»
+			}
 		«ENDFOR»
 		'''
 
-	def iterateTabs(MenuEntry root, int depth, MenuPackage pkg, String treeName)
-		'''
-		«FOR entry:root.subentries»
-			«IF entry.subentries !== null && entry.subentries.size !== 0 && (depth == 0 || pkg.subMenuIsAccordion)»
-				«entry.subentries.iterateEntries(root.entryid.toFirstUpper, depth+1, pkg)»
-			«ENDIF»
-		«ENDFOR»
-		'''
-		
 	def setIcon(MenuPackage pkg) {
 		'''
 		Tab tab = accordion.getTab(selectedMap.get(accordion));
@@ -542,7 +527,7 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 				setIcon(«accName», false);
 				selectedMap.put(«accName», «accName».getSelectedTab());
 				setIcon(«accName», true);
-				Component component = accRoot.getSelectedTab();
+				Component component = «accName».getSelectedTab();
 				if(component instanceof AbstractOrderedLayout) {
 					if(((AbstractOrderedLayout)component).getData() instanceof IViewEmbeddedProvider) {
 						IViewEmbeddedProvider view = ((IViewEmbeddedProvider)((AbstractOrderedLayout)component).getData());
@@ -558,29 +543,6 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
     	'''
     }
     
-    def valueChangeHandler(String entryName) {
-		'''
-		«entryName».addValueChangeListener(new ValueChangeListener() {
-			@Override
-			public void valueChange(ValueChangeEvent event) {
-				if («entryName».getValue() != null) {
-					UserMenuItem item = (UserMenuItem)«entryName».getValue();
-					if(item.getType() == UserMenuItemType.PROCESS) {
-						bpmnWindow.showBpmn(item.getCallId());
-					} 
-					else if(item.getType() == UserMenuItemType.PERSPECTIVE) {
-						bpmnWindow.closeBpmn();
-						log.debug("start perspective "+item.getId());
-						EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.CLOSE, null, null);
-						eventDispatcher.sendEvent(evnt);
-						perspectiveProvider.openPerspective(item.getCallId());
-					}
-				} 
-			}
-		});
-		'''
-    }	
-    
 	def localeChanged(MenuPackage pkg)
 		'''
 		this.locale = locale;
@@ -589,7 +551,7 @@ class MenuDslJvmModelInferrer extends AbstractModelInferrer {
 			tab.setDescription(dslMetadataService.translate(locale.toLanguageTag(),tabs.get(tab).getValue()));
 		}
 		for(UserMenuItem item: items.keySet()) {
-			item.setI18nId(dslMetadataService.translate(locale.toLanguageTag(),items.get(item)));
+			item.setLocale(locale);
 		}
 		designerText = dslMetadataService.translate(locale.toLanguageTag(),"designer");
 		designmodeText = dslMetadataService.translate(locale.toLanguageTag(),"designermode");
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.xtend b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.xtend
index e262f54..60579d3 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.xtend
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.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,6 +21,7 @@ package org.eclipse.osbp.xtext.menu.jvmmodel
 
 import com.vaadin.data.Property.ValueChangeEvent
 import com.vaadin.data.Property.ValueChangeListener
+import com.vaadin.ui.AbsoluteLayout
 import com.vaadin.ui.AbstractOrderedLayout
 import com.vaadin.ui.Accordion
 import com.vaadin.ui.Button
@@ -38,14 +41,12 @@ import com.vaadin.ui.UI
 import com.vaadin.ui.VerticalLayout
 import javax.inject.Inject
 import org.eclipse.e4.core.contexts.ContextInjectionFactory
-import org.eclipse.e4.core.di.extensions.EventUtils
 import org.eclipse.e4.ui.model.application.MApplication
-import org.eclipse.emf.common.util.TreeIterator
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.osbp.bpm.api.IBPMEngine
 import org.eclipse.osbp.bpm.api.IBlipBPMFunctionProvider
-import org.eclipse.osbp.eventbroker.EventBrokerMsg
+import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent
 import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent.EventDispatcherCommand
 import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent.EventDispatcherDataTag
 import org.eclipse.osbp.ui.api.contextfunction.IUserMenuProvider
@@ -53,24 +54,19 @@ import org.eclipse.osbp.ui.api.contextfunction.IViewEmbeddedProvider
 import org.eclipse.osbp.ui.api.themes.IThemeResourceService
 import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType
 import org.eclipse.osbp.ui.api.useraccess.AbstractAuthorization.Action
-import org.eclipse.osbp.ui.api.useraccess.AbstractAuthorization.Permission
+import org.eclipse.osbp.ui.api.useraccess.AbstractAuthorization.Group
 import org.eclipse.osbp.ui.api.useraccess.IUserAccessService
-import org.eclipse.osbp.utils.vaadin.YesNoDialog
+import org.eclipse.osbp.utils.vaadin.bpmn.BpmnWindow
 import org.eclipse.osbp.xtext.basic.generator.BasicDslGeneratorUtils
 import org.eclipse.osbp.xtext.i18n.I18NModelGenerator
-import org.eclipse.osbp.xtext.menu.MenuEntry
-import org.eclipse.osbp.xtext.menu.MenuPackage
 import org.eclipse.osbp.xtext.menu.common.UserMenuItem
 import org.eclipse.osbp.xtext.menu.common.UserMenuItem.UserMenuItemType
 import org.eclipse.xtext.generator.IFileSystemAccess
 import org.eclipse.xtext.xbase.compiler.GeneratorConfig
 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.ui.api.useraccess.AbstractAuthorization.Group
-import org.eclipse.osbp.utils.vaadin.bpmn.BpmnWindow
-import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent
+import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator
+import com.vaadin.ui.Tree.TreeDragMode
 
 class MenuModelGenerator extends I18NModelGenerator { 
 	@Inject extension BasicDslGeneratorUtils
@@ -80,37 +76,6 @@ class MenuModelGenerator extends I18NModelGenerator {
 		super.doGenerate(input, fsa)
 	}
 	
-	def parseResource(Resource resource) {
-		var str = ""
-		var TreeIterator<EObject> it = resource.allContents
-		while(it.hasNext()) {
-      		var EObject current = it.next();
-      		if (current instanceof MenuPackage) {
-      			for(entry:(current as MenuPackage).entries) {
-      				str = str + entry.iterateEntry()
-	      		}
-      		}
-  		}
-  		return str
-	}	
-
-	def String iterateEntry(MenuEntry entry) {
-		var str = ""
-		if (entry.hasTable) {
-			str = str + "	"
-  			str  = str + 
-  			'''
-			<reference bind="bind«entry.table.name.toFirstUpper»" cardinality="0..1" interface="org.eclipse.osbp.xtext.table.common.IViewEmbeddedProvider" name="«entry.table.name.toFirstUpper»" policy="dynamic" target="(type=«entry.table.name.toFirstUpper»)" unbind="unbind«entry.table.name.toFirstUpper»"/>
-  			'''
-  		}
-  		if (entry.subentries != null && entry.subentries.size > 0) {
-  			for(e:entry.subentries) {
-  				str = str + e.iterateEntry()
-  			}
-  		}
-		return str
-	}
-	
 	override createAppendable(EObject context, ImportManager importManager, GeneratorConfig config) {
 		// required to initialize the needed builder to avoid deprecated methods
 		builder = context.eResource
@@ -118,6 +83,7 @@ class MenuModelGenerator extends I18NModelGenerator {
 		addImportFor(importManager, _typeReferenceBuilder
 			, VerticalLayout
 			, HorizontalLayout
+			, AbsoluteLayout
 			, Label
 			, Image
 			, PopupButton
@@ -155,6 +121,8 @@ class MenuModelGenerator extends I18NModelGenerator {
 			, MenuBar
 			, MenuItem
 			, BpmnWindow
+			, ItemDescriptionGenerator
+			, TreeDragMode
 		)
 		super.createAppendable(context, importManager, config)
 	}
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.xtend b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.xtend
index a85de15..c05c8af 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.xtend
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.xtend
@@ -3,6 +3,14 @@
  */
 package org.eclipse.osbp.xtext.menu.scoping
 
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.EReference
+import org.eclipse.emf.ecore.InternalEObject
+import org.eclipse.osbp.xtext.dialogdsl.Dialog
+import org.eclipse.osbp.xtext.menu.MenuDslPackage
+import org.eclipse.xtext.scoping.IScope
+import org.eclipse.xtext.scoping.impl.FilteringScope
+import org.eclipse.osbp.xtext.table.Table
 
 /**
  * This class contains custom scoping description.
@@ -11,5 +19,53 @@ package org.eclipse.osbp.xtext.menu.scoping
  * on how and when to use it.
  */
 class MenuDslScopeProvider extends AbstractMenuDslScopeProvider {
+	@Override
+	override IScope getScope(EObject context, EReference reference) {
+		if (reference == MenuDslPackage.Literals.MENU_CATEGORY__DIALOG) {
+			return getEmbeddedDialog(context, reference)
+		} else if (reference == MenuDslPackage.Literals.MENU_CATEGORY__TABLE) {
+			return getEmbeddedTable(context, reference)
+		} else {
+			val scope = super.getScope(context, reference);
+			return scope
+		}
+	}
 
+	def IScope getEmbeddedDialog(EObject context, EReference reference) {
+		return new FilteringScope(super.getScope(context, reference), [
+			val entityProxy = it.EObjectOrProxy
+			var Dialog dialog = null;
+			if (entityProxy.eIsProxy) {
+				val uri = (entityProxy as InternalEObject).eProxyURI
+				dialog = context.eResource.resourceSet.getEObject(uri, true) as Dialog
+			} else {
+				dialog = entityProxy as Dialog;
+			}
+			if (dialog !== null) {
+				if(dialog.embedded) {
+					return true
+				}
+			}
+			return false
+		])
+	}
+
+	def IScope getEmbeddedTable(EObject context, EReference reference) {
+		return new FilteringScope(super.getScope(context, reference), [
+			val entityProxy = it.EObjectOrProxy
+			var Table table = null;
+			if (entityProxy.eIsProxy) {
+				val uri = (entityProxy as InternalEObject).eProxyURI
+				table = context.eResource.resourceSet.getEObject(uri, true) as Table
+			} else {
+				table = entityProxy as Table;
+			}
+			if (table !== null) {
+				if(table.tabletype.embedded) {
+					return true
+				}
+			}
+			return false
+		])
+	}
 }
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.xtend b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.xtend
index 104029f..c8df6f8 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.xtend
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.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.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuQualifiedNameProvider.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuQualifiedNameProvider.java
index cd14ed1..84695e6 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuQualifiedNameProvider.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuQualifiedNameProvider.java
@@ -3,25 +3,23 @@
  * 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 
  */
 package org.eclipse.osbp.xtext.menu.valueconverter;
 
-import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.osbp.xtext.menu.MenuCategory;
 import org.eclipse.osbp.xtext.menu.MenuEntry;
-import org.eclipse.osbp.xtext.menu.MenuPackage;
+import org.eclipse.osbp.xtext.menu.MenuTree;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.QualifiedName;
-import org.eclipse.xtext.nodemodel.INode;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.xbase.scoping.XbaseQualifiedNameProvider;
 
 import com.google.inject.Inject;
@@ -38,30 +36,27 @@ public class MenuQualifiedNameProvider extends XbaseQualifiedNameProvider {
 		if (obj == null) {
 			return QualifiedName.create("");
 		}
+		if (obj instanceof MenuCategory) {
+			MenuCategory category = (MenuCategory) obj;
+            if (category.getName() == null) {
+            	return null;
+            }
+            return qualifiedNameConverter.toQualifiedName(category.getName());
+		}
+		if (obj instanceof MenuTree) {
+			MenuTree tree = (MenuTree) obj;
+            if (tree.getName() == null) {
+            	return null;
+            }
+            return qualifiedNameConverter.toQualifiedName(tree.getName());
+		}
 		if (obj instanceof MenuEntry) {
 			MenuEntry menu = (MenuEntry) obj;
-            if (menu.getEntryid() == null) {
+            if (menu.getName() == null) {
             	return null;
             }
-            return qualifiedNameConverter.toQualifiedName(menu.getEntryid());
+            return qualifiedNameConverter.toQualifiedName(menu.getName());
 		}
 		return super.getFullyQualifiedName(obj);
 	}
-
-//	// this method evaluates the cross referenced name of an object without causing cyclic lazy linking errors
-//	private String getCrossReferenceName(EObject obj, EStructuralFeature feature) {
-//		List<INode> nodes = NodeModelUtils.findNodesForFeature(obj, feature);
-//		if (nodes.size() == 0) {
-//			return null;
-//		}
-//		return NodeModelUtils.getTokenText(nodes.get(0));
-//	}
-//
-//	private String getPackageName(EObject obj) {
-//		EObject o = obj.eContainer();
-//		while(!(o instanceof MenuPackage)) {
-//			o = o.eContainer();
-//		}
-//		return ((MenuPackage)o).getName();
-//	}
 }
diff --git a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuValueConverterService.java b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuValueConverterService.java
index de440ef..b7dbb35 100644
--- a/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuValueConverterService.java
+++ b/org.eclipse.osbp.xtext.menu/src/org/eclipse/osbp/xtext/menu/valueconverter/MenuValueConverterService.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.menu/xtend-gen/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.java b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.java
index a895f25..35edefd 100644
--- a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.java
+++ b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/formatting/MenuDslFormatter.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.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.java b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.java
index 63ea243..68d9558 100644
--- a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.java
+++ b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuDslJvmModelInferrer.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
@@ -22,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.function.Consumer;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -45,8 +48,10 @@ import org.eclipse.osbp.ui.api.useraccess.IUserAccessService;
 import org.eclipse.osbp.utils.annotation.CommonUtils;
 import org.eclipse.osbp.utils.vaadin.bpmn.BpmnWindow;
 import org.eclipse.osbp.vaaclipse.api.VaadinExecutorService;
+import org.eclipse.osbp.xtext.menu.MenuCategory;
 import org.eclipse.osbp.xtext.menu.MenuEntry;
 import org.eclipse.osbp.xtext.menu.MenuPackage;
+import org.eclipse.osbp.xtext.menu.MenuTree;
 import org.eclipse.osbp.xtext.menu.common.UserMenuItem;
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.Constants;
@@ -102,9 +107,9 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
   private boolean flagTreeMenu = false;
   
   protected void _infer(final MenuPackage pkg, final IJvmDeclaredTypeAcceptor acceptor, final boolean isPreIndexingPhase) {
-    String _replace = pkg.eResource().getURI().lastSegment().replace(("." + this.fileExtension), "");
-    String _firstUpper = StringExtensions.toFirstUpper(this.fileExtension);
-    String _plus = (_replace + _firstUpper);
+    String _firstUpper = StringExtensions.toFirstUpper(pkg.eResource().getURI().lastSegment().replace(("." + this.fileExtension), ""));
+    String _firstUpper_1 = StringExtensions.toFirstUpper(this.fileExtension);
+    String _plus = (_firstUpper + _firstUpper_1);
     this.clsName = _plus;
     String _name = pkg.getName();
     String _plus_1 = (_name + ".");
@@ -180,24 +185,24 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
   }
   
   public void toInjectedFields(final JvmDeclaredType type, final MenuPackage pkg) {
-    EList<MenuEntry> _entries = pkg.getEntries();
-    for (final MenuEntry entry : _entries) {
-      this.iterateFieldEntry(entry, type, pkg);
-    }
+    final Consumer<MenuCategory> _function = (MenuCategory it) -> {
+      this.createInjects(it, type, pkg);
+    };
+    pkg.getCategories().forEach(_function);
   }
   
-  public void iterateFieldEntry(final MenuEntry entry, final JvmDeclaredType type, final MenuPackage pkg) {
+  public void createInjects(final MenuCategory category, final JvmDeclaredType type, final MenuPackage pkg) {
     JvmField field = null;
-    if ((entry.isHasTable() || entry.isHasDialog())) {
+    if ((category.isHasTable() || category.isHasDialog())) {
       String name = "";
       ArrayList<String> list = CollectionLiterals.<String>newArrayList();
-      boolean _isHasTable = entry.isHasTable();
+      boolean _isHasTable = category.isHasTable();
       if (_isHasTable) {
-        name = entry.getTable().getName();
+        name = category.getTable().getName();
       } else {
-        boolean _isHasDialog = entry.isHasDialog();
+        boolean _isHasDialog = category.isHasDialog();
         if (_isHasDialog) {
-          name = entry.getDialog().getName();
+          name = category.getDialog().getName();
         }
       }
       if (((name != null) && (!name.isEmpty()))) {
@@ -219,12 +224,6 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
         }
       }
     }
-    if (((entry.getSubentries() != null) && (entry.getSubentries().size() > 0))) {
-      EList<MenuEntry> _subentries = entry.getSubentries();
-      for (final MenuEntry e : _subentries) {
-        this.iterateFieldEntry(e, type, pkg);
-      }
-    }
   }
   
   public void toConstructor(final JvmDeclaredType type, final MenuPackage pkg) {
@@ -349,17 +348,14 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
     field = this._jvmTypesBuilder.toField(pkg, "downloadText", this._typeReferenceBuilder.typeRef(String.class));
     EList<JvmMember> _members_18 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_18, field);
-    field = this._jvmTypesBuilder.toField(pkg, "blipSuccessful", this._typeReferenceBuilder.typeRef(boolean.class));
-    EList<JvmMember> _members_19 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_19, 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(pkg, "context", this._typeReferenceBuilder.typeRef(IEclipseContext.class), _function_8);
-    EList<JvmMember> _members_20 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_20, field);
+    EList<JvmMember> _members_19 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_19, field);
     final Procedure1<JvmField> _function_9 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -372,8 +368,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_2, _annotationRef_2);
     };
     field = this._jvmTypesBuilder.toField(pkg, "designModeHandler", this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), _function_9);
-    EList<JvmMember> _members_21 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_21, field);
+    EList<JvmMember> _members_20 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_20, field);
     final Procedure1<JvmField> _function_10 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -386,8 +382,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_2, _annotationRef_2);
     };
     field = this._jvmTypesBuilder.toField(pkg, "designerUndoHandler", this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), _function_10);
-    EList<JvmMember> _members_22 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_22, field);
+    EList<JvmMember> _members_21 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_21, field);
     final Procedure1<JvmField> _function_11 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -400,8 +396,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_2, _annotationRef_2);
     };
     field = this._jvmTypesBuilder.toField(pkg, "designerRedoHandler", this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), _function_11);
-    EList<JvmMember> _members_23 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_23, field);
+    EList<JvmMember> _members_22 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_22, field);
     final Procedure1<JvmField> _function_12 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -414,8 +410,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_2, _annotationRef_2);
     };
     field = this._jvmTypesBuilder.toField(pkg, "newPerspectiveHandler", this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), _function_12);
-    EList<JvmMember> _members_24 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_24, field);
+    EList<JvmMember> _members_23 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_23, field);
     final Procedure1<JvmField> _function_13 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -428,8 +424,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_2, _annotationRef_2);
     };
     field = this._jvmTypesBuilder.toField(pkg, "changePerspectiveHandler", this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), _function_13);
-    EList<JvmMember> _members_25 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_25, field);
+    EList<JvmMember> _members_24 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_24, field);
     final Procedure1<JvmField> _function_14 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -442,8 +438,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_2, _annotationRef_2);
     };
     field = this._jvmTypesBuilder.toField(pkg, "exportPerspectiveHandler", this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), _function_14);
-    EList<JvmMember> _members_26 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_26, field);
+    EList<JvmMember> _members_25 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_25, field);
     final Procedure1<JvmField> _function_15 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -456,27 +452,24 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_2, _annotationRef_2);
     };
     field = this._jvmTypesBuilder.toField(pkg, "downloadPerspectiveHandler", this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), _function_15);
-    EList<JvmMember> _members_27 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_27, field);
+    EList<JvmMember> _members_26 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_26, field);
     final Procedure1<JvmField> _function_16 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
-      EList<JvmAnnotationReference> _annotations_1 = it.getAnnotations();
-      JvmAnnotationReference _annotationRef_1 = this._annotationTypesBuilder.annotationRef(Named.class, "Blip");
-      this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_1, _annotationRef_1);
     };
     field = this._jvmTypesBuilder.toField(pkg, "blip", this._typeReferenceBuilder.typeRef(IBlipBPMFunctionProvider.class), _function_16);
-    EList<JvmMember> _members_28 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_28, field);
+    EList<JvmMember> _members_27 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_27, field);
     field = this._jvmTypesBuilder.toField(pkg, "tabs", 
       this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(TabSheet.Tab.class), this._typeReferenceBuilder.typeRef(Pair.class, this._typeReferenceBuilder.typeRef(String.class), this._typeReferenceBuilder.typeRef(String.class))));
-    EList<JvmMember> _members_29 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_29, field);
+    EList<JvmMember> _members_28 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_28, field);
     field = this._jvmTypesBuilder.toField(pkg, "items", 
       this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(UserMenuItem.class), this._typeReferenceBuilder.typeRef(String.class)));
-    EList<JvmMember> _members_30 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_30, field);
+    EList<JvmMember> _members_29 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_29, field);
     final Procedure1<JvmField> _function_17 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -486,8 +479,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_1, _annotationRef_1);
     };
     field = this._jvmTypesBuilder.toField(pkg, "userFilter", this._typeReferenceBuilder.typeRef(IVaadinDialogProvider.class), _function_17);
-    EList<JvmMember> _members_31 = type.getMembers();
-    this._jvmTypesBuilder.<JvmField>operator_add(_members_31, field);
+    EList<JvmMember> _members_30 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_30, field);
     final Procedure1<JvmField> _function_18 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
@@ -497,41 +490,63 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_1, _annotationRef_1);
     };
     field = this._jvmTypesBuilder.toField(pkg, "keyBinding", this._typeReferenceBuilder.typeRef(IVaadinDialogProvider.class), _function_18);
+    EList<JvmMember> _members_31 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_31, field);
+    final Procedure1<JvmField> _function_19 = (JvmField it) -> {
+      EList<JvmAnnotationReference> _annotations = it.getAnnotations();
+      JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
+      this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
+      EList<JvmAnnotationReference> _annotations_1 = it.getAnnotations();
+      JvmAnnotationReference _annotationRef_1 = this._annotationTypesBuilder.annotationRef(Named.class, "SystemSettings");
+      this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_1, _annotationRef_1);
+    };
+    field = this._jvmTypesBuilder.toField(pkg, "systemSettings", this._typeReferenceBuilder.typeRef(IVaadinDialogProvider.class), _function_19);
     EList<JvmMember> _members_32 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_32, field);
-    final Procedure1<JvmField> _function_19 = (JvmField it) -> {
+    final Procedure1<JvmField> _function_20 = (JvmField it) -> {
       EList<JvmAnnotationReference> _annotations = it.getAnnotations();
       JvmAnnotationReference _annotationRef = this._annotationTypesBuilder.annotationRef(Inject.class);
       this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
+      EList<JvmAnnotationReference> _annotations_1 = it.getAnnotations();
+      JvmAnnotationReference _annotationRef_1 = this._annotationTypesBuilder.annotationRef(Named.class, "ReportPrinterDialog");
+      this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations_1, _annotationRef_1);
     };
-    field = this._jvmTypesBuilder.toField(pkg, "executorService", this._typeReferenceBuilder.typeRef(VaadinExecutorService.class), _function_19);
+    field = this._jvmTypesBuilder.toField(pkg, "reportPrinter", this._typeReferenceBuilder.typeRef(IVaadinDialogProvider.class), _function_20);
     EList<JvmMember> _members_33 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_33, field);
-    final Procedure1<JvmField> _function_20 = (JvmField it) -> {
-      final Procedure1<ITreeAppendable> _function_21 = (ITreeAppendable it_1) -> {
-        StringConcatenation _builder = new StringConcatenation();
-        _builder.append("new HashMap<>()");
-        it_1.append(_builder);
-      };
-      this._jvmTypesBuilder.setInitializer(it, _function_21);
+    final Procedure1<JvmField> _function_21 = (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(pkg, "enabledUpdaters", this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(MenuBar.MenuItem.class), this._typeReferenceBuilder.typeRef(Runnable.class)), _function_20);
+    field = this._jvmTypesBuilder.toField(pkg, "executorService", this._typeReferenceBuilder.typeRef(VaadinExecutorService.class), _function_21);
     EList<JvmMember> _members_34 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_34, field);
-    final Procedure1<JvmField> _function_21 = (JvmField it) -> {
-      final Procedure1<ITreeAppendable> _function_22 = (ITreeAppendable it_1) -> {
+    final Procedure1<JvmField> _function_22 = (JvmField it) -> {
+      final Procedure1<ITreeAppendable> _function_23 = (ITreeAppendable it_1) -> {
         StringConcatenation _builder = new StringConcatenation();
         _builder.append("new HashMap<>()");
         it_1.append(_builder);
       };
-      this._jvmTypesBuilder.setInitializer(it, _function_22);
+      this._jvmTypesBuilder.setInitializer(it, _function_23);
     };
-    field = this._jvmTypesBuilder.toField(pkg, "menuItems", this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), this._typeReferenceBuilder.typeRef(MenuBar.MenuItem.class)), _function_21);
+    field = this._jvmTypesBuilder.toField(pkg, "enabledUpdaters", this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(MenuBar.MenuItem.class), this._typeReferenceBuilder.typeRef(Runnable.class)), _function_22);
     EList<JvmMember> _members_35 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_35, field);
-    field = this._jvmTypesBuilder.toField(pkg, "bpmnWindow", this._typeReferenceBuilder.typeRef(BpmnWindow.class));
+    final Procedure1<JvmField> _function_23 = (JvmField it) -> {
+      final Procedure1<ITreeAppendable> _function_24 = (ITreeAppendable it_1) -> {
+        StringConcatenation _builder = new StringConcatenation();
+        _builder.append("new HashMap<>()");
+        it_1.append(_builder);
+      };
+      this._jvmTypesBuilder.setInitializer(it, _function_24);
+    };
+    field = this._jvmTypesBuilder.toField(pkg, "menuItems", this._typeReferenceBuilder.typeRef(HashMap.class, this._typeReferenceBuilder.typeRef(IMenuItemHandler.class), this._typeReferenceBuilder.typeRef(MenuBar.MenuItem.class)), _function_23);
     EList<JvmMember> _members_36 = type.getMembers();
     this._jvmTypesBuilder.<JvmField>operator_add(_members_36, field);
+    field = this._jvmTypesBuilder.toField(pkg, "bpmnWindow", this._typeReferenceBuilder.typeRef(BpmnWindow.class));
+    EList<JvmMember> _members_37 = type.getMembers();
+    this._jvmTypesBuilder.<JvmField>operator_add(_members_37, field);
   }
   
   public void toOperations(final JvmDeclaredType type, final MenuPackage pkg) {
@@ -730,8 +745,6 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
   
   public CharSequence init(final MenuPackage pkg) {
     StringConcatenation _builder = new StringConcatenation();
-    _builder.append("blipSuccessful = blip.initBlip();");
-    _builder.newLine();
     _builder.append("bpmnWindow = new BpmnWindow(bpmEngine, blip, context);");
     _builder.newLine();
     _builder.append("tabs = new HashMap<>();");
@@ -763,6 +776,8 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
     _builder.newLine();
     _builder.append("VerticalLayout tabRoot = new VerticalLayout();");
     _builder.newLine();
+    _builder.append("tabRoot.setSizeFull();");
+    _builder.newLine();
     {
       boolean _isHasDesigner = pkg.isHasDesigner();
       if (_isHasDesigner) {
@@ -892,48 +907,193 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
         _builder.newLine();
       }
     }
-    String _iterateEntries = this.iterateEntries(pkg.getEntries(), "Root", 0, pkg);
-    _builder.append(_iterateEntries);
+    String _createRootMenu = this.createRootMenu(pkg);
+    _builder.append(_createRootMenu);
     _builder.newLineIfNotEmpty();
     _builder.append("return tabRoot;");
     _builder.newLine();
     return _builder;
   }
   
-  public String iterateEntries(final EList<MenuEntry> entries, final String parentName, final int depth, final MenuPackage pkg) {
+  public String createRootMenu(final MenuPackage pkg) {
     StringConcatenation _builder = new StringConcatenation();
-    _builder.append("// start depth: ");
-    _builder.append(depth);
+    _builder.append("ItemDescriptionGenerator generator = new ItemDescriptionGenerator() {                             ");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("public String generateDescription(Component source, Object itemId, Object propertyId) {");
+    _builder.newLine();
+    _builder.append("\t    ");
+    _builder.append("return ((UserMenuItem)itemId).getI18nDescription();");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("};");
+    _builder.newLine();
+    _builder.append("ValueChangeListener valueChangeListener = new ValueChangeListener() {");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("@Override");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("public void valueChange(ValueChangeEvent event) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("UserMenuItem item = (UserMenuItem) ((Tree)event.getProperty()).getValue();");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("if(item != null) {");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("if(item.getType() == UserMenuItemType.PROCESS) {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("bpmnWindow.showBpmn(item.getCallId());");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("} ");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("else if(item.getType() == UserMenuItemType.PERSPECTIVE) {");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("bpmnWindow.closeBpmn();");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("log.debug(\"start perspective \"+item.getCallId());");
+    _builder.newLine();
+    _builder.append("\t\t\t\t");
+    _builder.append("perspectiveProvider.openPerspective(item.getCallId());");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t\t");
+    _builder.append("((Tree)event.getProperty()).select(null);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.CLOSE, \"UserMenu\", \"");
+    String _string = this._iQualifiedNameProvider.getFullyQualifiedName(pkg).toString();
+    _builder.append(_string, "\t\t");
+    _builder.append("\");");
     _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    _builder.append("eventDispatcher.sendEvent(evnt);");
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("};");
+    _builder.newLine();
+    _builder.append("Accordion accordion = new Accordion();");
+    _builder.newLine();
+    _builder.append("tabRoot.addComponent(accordion);");
+    _builder.newLine();
     {
-      if ((pkg.isSubMenuIsAccordion() || (depth == 0))) {
-        _builder.append("Accordion acc");
-        _builder.append(parentName);
-        _builder.append(" = new Accordion();");
-        _builder.newLineIfNotEmpty();
+      String _height = pkg.getHeight();
+      boolean _tripleNotEquals = (_height != null);
+      if (_tripleNotEquals) {
+        _builder.append("accordion.setHeight(\"");
+        String _height_1 = pkg.getHeight();
+        _builder.append(_height_1);
+        _builder.append("\");");
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    _builder.append("accordion.setWidth(");
+    {
+      String _width = pkg.getWidth();
+      boolean _tripleNotEquals_1 = (_width != null);
+      if (_tripleNotEquals_1) {
+        _builder.append("\"");
+        String _width_1 = pkg.getWidth();
+        _builder.append(_width_1);
+        _builder.append("\"");
+      } else {
+        _builder.append("\"400px\"");
+      }
+    }
+    _builder.append(");");
+    _builder.newLineIfNotEmpty();
+    _builder.append("accordion.addStyleName(\"os-accordion-level0\");");
+    _builder.newLine();
+    CharSequence _selectedHandler = this.selectedHandler("accordion");
+    _builder.append(_selectedHandler);
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    {
+      EList<MenuCategory> _categories = pkg.getCategories();
+      for(final MenuCategory category : _categories) {
         {
-          String _height = pkg.getHeight();
-          boolean _tripleNotEquals = (_height != null);
-          if (_tripleNotEquals) {
-            _builder.append("acc");
-            _builder.append(parentName);
-            _builder.append(".setHeight(\"");
-            String _height_1 = pkg.getHeight();
-            _builder.append(_height_1);
-            _builder.append("\");");
+          boolean _isHasUserFilter = category.isHasUserFilter();
+          if (_isHasUserFilter) {
+            _builder.append("if(userAccessService.isSuperuser()) {");
+            _builder.newLine();
+          } else {
+            _builder.append("if(true) {");
+            _builder.newLine();
           }
         }
+        _builder.append("\t");
+        _builder.append("VerticalLayout tab");
+        String _firstUpper = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper, "\t");
+        _builder.append(" = new VerticalLayout();");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        _builder.append("Tree category");
+        String _firstUpper_1 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_1, "\t");
+        _builder.append(" = new Tree();");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        _builder.append("if(dslMetadataService.isOsbee()) {");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("category");
+        String _firstUpper_2 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_2, "\t\t");
+        _builder.append(".setDragMode(TreeDragMode.NODE);");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        _builder.append("}");
+        _builder.newLine();
+        _builder.append("\t");
+        _builder.append("category");
+        String _firstUpper_3 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_3, "\t");
+        _builder.append(".addValueChangeListener(valueChangeListener);");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        _builder.append("category");
+        String _name = category.getName();
+        _builder.append(_name, "\t");
+        _builder.append(".setItemDescriptionGenerator(generator);");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t");
+        _builder.append("tab");
+        String _firstUpper_4 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_4, "\t");
+        _builder.append(".addComponent(category");
+        String _firstUpper_5 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_5, "\t");
+        _builder.append(");");
         _builder.newLineIfNotEmpty();
-        _builder.append("acc");
-        _builder.append(parentName);
+        _builder.append("\t");
+        _builder.append("category");
+        String _firstUpper_6 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_6, "\t");
         _builder.append(".setWidth(");
         {
-          String _width = pkg.getWidth();
-          boolean _tripleNotEquals_1 = (_width != null);
-          if (_tripleNotEquals_1) {
+          String _width_2 = pkg.getWidth();
+          boolean _tripleNotEquals_2 = (_width_2 != null);
+          if (_tripleNotEquals_2) {
             _builder.append("\"");
-            String _width_1 = pkg.getWidth();
-            _builder.append(_width_1);
+            String _width_3 = pkg.getWidth();
+            _builder.append(_width_3, "\t");
             _builder.append("\"");
           } else {
             _builder.append("\"400px\"");
@@ -941,500 +1101,339 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
         }
         _builder.append(");");
         _builder.newLineIfNotEmpty();
-        _builder.append("acc");
-        _builder.append(parentName);
-        _builder.append(".addStyleName(\"os-accordion-level");
-        _builder.append(depth);
-        _builder.append("\");");
+        _builder.append("\t");
+        _builder.append("category");
+        String _firstUpper_7 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_7, "\t");
+        _builder.append(".addStyleName(\"os-menutree-level0\");");
         _builder.newLineIfNotEmpty();
-        StringConcatenation _builder_1 = new StringConcatenation();
-        _builder_1.append("acc");
-        _builder_1.append(parentName);
-        CharSequence _selectedHandler = this.selectedHandler(_builder_1.toString());
-        _builder.append(_selectedHandler);
+        _builder.append("\t");
+        _builder.append("accordion.addTab(tab");
+        String _firstUpper_8 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_8, "\t");
+        _builder.append(", \"");
+        String _name_1 = category.getName();
+        _builder.append(_name_1, "\t");
+        _builder.append("\", themeResourceService.getThemeResource(\"");
+        String _collapsedImage = pkg.getCollapsedImage();
+        _builder.append(_collapsedImage, "\t");
+        _builder.append("\", ThemeResourceType.ICON));");
         _builder.newLineIfNotEmpty();
-        _builder.append("tab");
-        _builder.append(parentName);
-        _builder.append(".addComponent(acc");
-        _builder.append(parentName);
-        _builder.append(");");
+        _builder.append("\t");
+        _builder.append("tabs.put(accordion.getTab(tab");
+        String _firstUpper_9 = StringExtensions.toFirstUpper(category.getName());
+        _builder.append(_firstUpper_9, "\t");
+        _builder.append("), new Pair(\"");
+        String _name_2 = category.getName();
+        _builder.append(_name_2, "\t");
+        _builder.append("\",\"\"));");
         _builder.newLineIfNotEmpty();
         {
-          for(final MenuEntry entry : entries) {
-            {
-              boolean _isHasUserFilter = entry.isHasUserFilter();
-              if (_isHasUserFilter) {
-                _builder.append("if (userAccessService.isSuperuser()) {");
-              }
-            }
+          boolean _isHasTable = category.isHasTable();
+          if (_isHasTable) {
+            _builder.append("\t");
+            String _firstLower = StringExtensions.toFirstLower(category.getTable().getName());
+            _builder.append(_firstLower, "\t");
+            _builder.append(".createView(tab");
+            String _firstUpper_10 = StringExtensions.toFirstUpper(category.getName());
+            _builder.append(_firstUpper_10, "\t");
+            _builder.append(");");
             _builder.newLineIfNotEmpty();
-            _builder.append("VerticalLayout tab");
-            String _firstUpper = StringExtensions.toFirstUpper(entry.getEntryid());
-            _builder.append(_firstUpper);
-            _builder.append(" = new VerticalLayout();");
+            _builder.append("\t");
+            _builder.append("tab");
+            String _firstUpper_11 = StringExtensions.toFirstUpper(category.getName());
+            _builder.append(_firstUpper_11, "\t");
+            _builder.append(".setData(");
+            String _firstLower_1 = StringExtensions.toFirstLower(category.getTable().getName());
+            _builder.append(_firstLower_1, "\t");
+            _builder.append(");");
             _builder.newLineIfNotEmpty();
-            {
-              boolean _isHasTable = entry.isHasTable();
-              if (_isHasTable) {
-                String _firstLower = StringExtensions.toFirstLower(entry.getTable().getName());
-                _builder.append(_firstLower);
-                _builder.append(".createView(tab");
-                String _firstUpper_1 = StringExtensions.toFirstUpper(entry.getEntryid());
-                _builder.append(_firstUpper_1);
-                _builder.append(");");
-                _builder.newLineIfNotEmpty();
-                _builder.append("tab");
-                String _firstUpper_2 = StringExtensions.toFirstUpper(entry.getEntryid());
-                _builder.append(_firstUpper_2);
-                _builder.append(".setData(");
-                String _firstLower_1 = StringExtensions.toFirstLower(entry.getTable().getName());
-                _builder.append(_firstLower_1);
+          } else {
+            boolean _isHasDialog = category.isHasDialog();
+            if (_isHasDialog) {
+              _builder.append("\t");
+              String _firstLower_2 = StringExtensions.toFirstLower(category.getDialog().getName());
+              _builder.append(_firstLower_2, "\t");
+              _builder.append(".createView(tab");
+              String _firstUpper_12 = StringExtensions.toFirstUpper(category.getName());
+              _builder.append(_firstUpper_12, "\t");
+              _builder.append(");");
+              _builder.newLineIfNotEmpty();
+              _builder.append("\t");
+              _builder.append("tab");
+              String _firstUpper_13 = StringExtensions.toFirstUpper(category.getName());
+              _builder.append(_firstUpper_13, "\t");
+              _builder.append(".setData(");
+              String _firstLower_3 = StringExtensions.toFirstLower(category.getDialog().getName());
+              _builder.append(_firstLower_3, "\t");
+              _builder.append(");");
+              _builder.newLineIfNotEmpty();
+            } else {
+              boolean _isHasUserFilter_1 = category.isHasUserFilter();
+              if (_isHasUserFilter_1) {
+                _builder.append("\t");
+                _builder.append("userFilter.createView(tab");
+                String _firstUpper_14 = StringExtensions.toFirstUpper(category.getName());
+                _builder.append(_firstUpper_14, "\t");
                 _builder.append(");");
                 _builder.newLineIfNotEmpty();
               } else {
-                boolean _isHasDialog = entry.isHasDialog();
-                if (_isHasDialog) {
-                  String _firstLower_2 = StringExtensions.toFirstLower(entry.getDialog().getName());
-                  _builder.append(_firstLower_2);
-                  _builder.append(".createView(tab");
-                  String _firstUpper_3 = StringExtensions.toFirstUpper(entry.getEntryid());
-                  _builder.append(_firstUpper_3);
-                  _builder.append(");");
-                  _builder.newLineIfNotEmpty();
-                  _builder.append("tab");
-                  String _firstUpper_4 = StringExtensions.toFirstUpper(entry.getEntryid());
-                  _builder.append(_firstUpper_4);
-                  _builder.append(".setData(");
-                  String _firstLower_3 = StringExtensions.toFirstLower(entry.getDialog().getName());
-                  _builder.append(_firstLower_3);
+                boolean _isHasKeyBinding = category.isHasKeyBinding();
+                if (_isHasKeyBinding) {
+                  _builder.append("\t");
+                  _builder.append("keyBinding.createView(tab");
+                  String _firstUpper_15 = StringExtensions.toFirstUpper(category.getName());
+                  _builder.append(_firstUpper_15, "\t");
                   _builder.append(");");
                   _builder.newLineIfNotEmpty();
                 } else {
-                  boolean _isHasUserFilter_1 = entry.isHasUserFilter();
-                  if (_isHasUserFilter_1) {
-                    _builder.append("userFilter.createView(tab");
-                    String _firstUpper_5 = StringExtensions.toFirstUpper(entry.getEntryid());
-                    _builder.append(_firstUpper_5);
+                  boolean _isHasSystemSettings = category.isHasSystemSettings();
+                  if (_isHasSystemSettings) {
+                    _builder.append("\t");
+                    _builder.append("systemSettings.createView(tab");
+                    String _firstUpper_16 = StringExtensions.toFirstUpper(category.getName());
+                    _builder.append(_firstUpper_16, "\t");
                     _builder.append(");");
                     _builder.newLineIfNotEmpty();
                   } else {
-                    boolean _isHasKeyBinding = entry.isHasKeyBinding();
-                    if (_isHasKeyBinding) {
-                      _builder.append("keyBinding.createView(tab");
-                      String _firstUpper_6 = StringExtensions.toFirstUpper(entry.getEntryid());
-                      _builder.append(_firstUpper_6);
+                    boolean _isHasReportPrinter = category.isHasReportPrinter();
+                    if (_isHasReportPrinter) {
+                      _builder.append("\t");
+                      _builder.append("reportPrinter.createView(tab");
+                      String _firstUpper_17 = StringExtensions.toFirstUpper(category.getName());
+                      _builder.append(_firstUpper_17, "\t");
                       _builder.append(");");
                       _builder.newLineIfNotEmpty();
-                    } else {
-                      CharSequence _iterateTabs = this.iterateTabs(entry, depth, pkg, null);
-                      _builder.append(_iterateTabs);
-                      _builder.newLineIfNotEmpty();
                     }
                   }
                 }
               }
             }
-            _builder.append("acc");
-            _builder.append(parentName);
-            _builder.append(".addTab(tab");
-            String _firstUpper_7 = StringExtensions.toFirstUpper(entry.getEntryid());
-            _builder.append(_firstUpper_7);
-            _builder.append(", \"");
-            String _entryid = entry.getEntryid();
-            _builder.append(_entryid);
-            _builder.append("\", themeResourceService.getThemeResource(\"");
-            String _collapsedImage = pkg.getCollapsedImage();
-            _builder.append(_collapsedImage);
-            _builder.append("\", ThemeResourceType.ICON));");
-            _builder.newLineIfNotEmpty();
-            _builder.append("tabs.put(acc");
-            _builder.append(parentName);
-            _builder.append(".getTab(tab");
-            String _firstUpper_8 = StringExtensions.toFirstUpper(entry.getEntryid());
-            _builder.append(_firstUpper_8);
-            _builder.append("), new Pair(\"");
-            String _entryid_1 = entry.getEntryid();
-            _builder.append(_entryid_1);
-            _builder.append("\",\"");
-            String _descriptionValue = entry.getDescriptionValue();
-            _builder.append(_descriptionValue);
-            _builder.append("\"));");
-            _builder.newLineIfNotEmpty();
-            {
-              boolean _isHasUserFilter_2 = entry.isHasUserFilter();
-              if (_isHasUserFilter_2) {
-                _builder.append("}");
-              }
-            }
-            _builder.newLineIfNotEmpty();
           }
         }
-        _builder.append("selectedMap.put(acc");
-        _builder.append(parentName);
-        _builder.append(", acc");
-        _builder.append(parentName);
-        _builder.append(".getSelectedTab());");
-        _builder.newLineIfNotEmpty();
-      } else {
         {
-          for(final MenuEntry entry_1 : entries) {
-            _builder.append("// tree for ");
-            String entryIdName = StringExtensions.toFirstUpper(entry_1.getEntryid());
-            _builder.newLineIfNotEmpty();
-            _builder.append("Tree tree");
-            _builder.append(parentName);
-            _builder.append(entryIdName);
-            _builder.append(" = new Tree();");
-            _builder.newLineIfNotEmpty();
-            _builder.append("tree");
-            _builder.append(parentName);
-            _builder.append(entryIdName);
-            _builder.append(".setWidth(\"300px\");");
+          EList<MenuTree> _trees = category.getTrees();
+          for(final MenuTree tree : _trees) {
+            _builder.append("\t");
+            _builder.append("UserMenuItem ");
+            String _name_3 = tree.getName();
+            _builder.append(_name_3, "\t");
+            _builder.append(" = new UserMenuItem(dslMetadataService, \"");
+            String _name_4 = tree.getName();
+            _builder.append(_name_4, "\t");
+            _builder.append("\", \"");
+            String _name_5 = tree.getName();
+            _builder.append(_name_5, "\t");
+            _builder.append("\", UserMenuItemType.NONE, \"");
+            String _tooltip = tree.getTooltip();
+            _builder.append(_tooltip, "\t");
+            _builder.append("\", null);");
             _builder.newLineIfNotEmpty();
-            _builder.append("tree");
-            _builder.append(parentName);
-            _builder.append(entryIdName);
-            _builder.append(".addStyleName(\"os-menutree-level");
-            _builder.append(depth);
+            _builder.append("\t");
+            _builder.append("items.put(");
+            String _name_6 = tree.getName();
+            _builder.append(_name_6, "\t");
+            _builder.append(", \"");
+            String _name_7 = tree.getName();
+            _builder.append(_name_7, "\t");
             _builder.append("\");");
             _builder.newLineIfNotEmpty();
-            _builder.append("tree");
-            _builder.append(parentName);
-            _builder.append(entryIdName);
-            _builder.append(".setImmediate(");
-            _builder.append(this.flagTreeMenu = true);
+            _builder.append("\t");
+            _builder.append("category");
+            String _firstUpper_18 = StringExtensions.toFirstUpper(category.getName());
+            _builder.append(_firstUpper_18, "\t");
+            _builder.append(".addItem(");
+            String _name_8 = tree.getName();
+            _builder.append(_name_8, "\t");
             _builder.append(");");
             _builder.newLineIfNotEmpty();
-            StringConcatenation _builder_2 = new StringConcatenation();
-            _builder_2.append("tree");
-            _builder_2.append(parentName);
-            _builder_2.append(entryIdName);
-            CharSequence _valueChangeHandler = this.valueChangeHandler(_builder_2.toString());
-            _builder.append(_valueChangeHandler);
-            _builder.newLineIfNotEmpty();
-            _builder.append("tab");
-            _builder.append(parentName);
-            _builder.append(".addComponent(tree");
-            _builder.append(parentName);
-            _builder.append(entryIdName);
-            _builder.append(");");
+            _builder.append("\t");
+            _builder.append("category");
+            String _firstUpper_19 = StringExtensions.toFirstUpper(category.getName());
+            _builder.append(_firstUpper_19, "\t");
+            _builder.append(".setChildrenAllowed(");
+            String _name_9 = tree.getName();
+            _builder.append(_name_9, "\t");
+            _builder.append(", true);");
             _builder.newLineIfNotEmpty();
             {
-              boolean _isHasTable_1 = entry_1.isHasTable();
-              if (_isHasTable_1) {
-                _builder.append(this.binderClassName);
-                _builder.append(".get");
-                String _firstUpper_9 = StringExtensions.toFirstUpper(entry_1.getTable().getName());
-                _builder.append(_firstUpper_9);
-                _builder.append("().createView(tab");
-                String _firstUpper_10 = StringExtensions.toFirstUpper(entry_1.getEntryid());
-                _builder.append(_firstUpper_10);
-                _builder.append(");");
+              EList<MenuEntry> _entries = tree.getEntries();
+              for(final MenuEntry entry : _entries) {
+                {
+                  boolean _isHasProcess = entry.isHasProcess();
+                  if (_isHasProcess) {
+                    _builder.append("\t");
+                    _builder.append("if(bpmEngine != null && userAccessService.isGranted(Group.PROCESS, Action.STARTABLE, \"");
+                    String _name_10 = entry.getProcess().getName();
+                    _builder.append(_name_10, "\t");
+                    _builder.append("\")) {");
+                    _builder.newLineIfNotEmpty();
+                  } else {
+                    _builder.append("\t");
+                    _builder.append("if(true) {");
+                    _builder.newLine();
+                  }
+                }
+                _builder.append("\t");
+                _builder.append("\t");
+                _builder.append("UserMenuItem ");
+                String _name_11 = tree.getName();
+                _builder.append(_name_11, "\t\t");
+                String _name_12 = entry.getName();
+                _builder.append(_name_12, "\t\t");
+                _builder.append(" = new UserMenuItem(dslMetadataService, \"");
+                String _name_13 = entry.getName();
+                _builder.append(_name_13, "\t\t");
+                _builder.append("\", ");
                 _builder.newLineIfNotEmpty();
-              } else {
-                boolean _isHasDialog_1 = entry_1.isHasDialog();
-                if (_isHasDialog_1) {
-                  _builder.append(this.binderClassName);
-                  _builder.append(".get");
-                  String _firstUpper_11 = StringExtensions.toFirstUpper(entry_1.getDialog().getName());
-                  _builder.append(_firstUpper_11);
-                  _builder.append("().createView(tab");
-                  String _firstUpper_12 = StringExtensions.toFirstUpper(entry_1.getEntryid());
-                  _builder.append(_firstUpper_12);
-                  _builder.append(");");
-                  _builder.newLineIfNotEmpty();
-                } else {
-                  boolean _isHasUserFilter_3 = entry_1.isHasUserFilter();
-                  if (_isHasUserFilter_3) {
-                    _builder.append(this.binderClassName);
-                    _builder.append(".getUserFilter().createView(tab");
-                    String _firstUpper_13 = StringExtensions.toFirstUpper(entry_1.getEntryid());
-                    _builder.append(_firstUpper_13);
-                    _builder.append(");");
+                _builder.append("\t");
+                _builder.append("\t");
+                {
+                  boolean _isHasProcess_1 = entry.isHasProcess();
+                  if (_isHasProcess_1) {
+                    _builder.append("\"");
+                    String _name_14 = entry.getProcess().getName();
+                    _builder.append(_name_14, "\t\t");
+                    _builder.append("\"");
                     _builder.newLineIfNotEmpty();
+                    _builder.append("\t");
+                    _builder.append("\t");
                   } else {
-                    StringConcatenation _builder_3 = new StringConcatenation();
-                    _builder_3.append("tree");
-                    _builder_3.append(parentName);
-                    _builder_3.append(entryIdName);
-                    String _iterateMenu = this.iterateMenu(entry_1, null, depth, pkg, _builder_3.toString());
-                    _builder.append(_iterateMenu);
+                    boolean _isHasPerspective = entry.isHasPerspective();
+                    if (_isHasPerspective) {
+                      _builder.append("\"");
+                      QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(entry.getPerspective());
+                      _builder.append(_fullyQualifiedName, "\t\t");
+                      _builder.append("\"");
+                      _builder.newLineIfNotEmpty();
+                      _builder.append("\t");
+                      _builder.append("\t");
+                    } else {
+                      _builder.append("\"\"");
+                      _builder.newLineIfNotEmpty();
+                      _builder.append("\t");
+                      _builder.append("\t");
+                    }
+                  }
+                }
+                _builder.append(", UserMenuItemType.");
+                {
+                  boolean _isHasProcess_2 = entry.isHasProcess();
+                  if (_isHasProcess_2) {
+                    _builder.append("PROCESS, \"");
+                    String _descriptionValue = entry.getProcess().getDescriptionValue();
+                    _builder.append(_descriptionValue, "\t\t");
+                    _builder.append("\"");
+                    _builder.newLineIfNotEmpty();
+                    _builder.append("\t");
+                    _builder.append("\t");
+                  } else {
+                    boolean _isHasPerspective_1 = entry.isHasPerspective();
+                    if (_isHasPerspective_1) {
+                      _builder.append("PERSPECTIVE, \"");
+                      String _descriptionValue_1 = entry.getPerspective().getDescriptionValue();
+                      _builder.append(_descriptionValue_1, "\t\t");
+                      _builder.append("\"");
+                    } else {
+                      _builder.append("NONE, \"\"");
+                      _builder.newLineIfNotEmpty();
+                      _builder.append("\t");
+                      _builder.append("\t");
+                    }
+                  }
+                }
+                _builder.append(", \"");
+                String _icon = entry.getIcon();
+                _builder.append(_icon, "\t\t");
+                _builder.append("\");");
+                _builder.newLineIfNotEmpty();
+                _builder.append("\t");
+                _builder.append("\t");
+                _builder.append("items.put(");
+                String _name_15 = tree.getName();
+                _builder.append(_name_15, "\t\t");
+                String _name_16 = entry.getName();
+                _builder.append(_name_16, "\t\t");
+                _builder.append(", \"");
+                String _name_17 = entry.getName();
+                _builder.append(_name_17, "\t\t");
+                _builder.append("\");");
+                _builder.newLineIfNotEmpty();
+                _builder.append("\t");
+                _builder.append("\t");
+                _builder.append("category");
+                String _firstUpper_20 = StringExtensions.toFirstUpper(category.getName());
+                _builder.append(_firstUpper_20, "\t\t");
+                _builder.append(".addItem(");
+                String _name_18 = tree.getName();
+                _builder.append(_name_18, "\t\t");
+                String _name_19 = entry.getName();
+                _builder.append(_name_19, "\t\t");
+                _builder.append(");");
+                _builder.newLineIfNotEmpty();
+                _builder.append("\t");
+                _builder.append("\t");
+                _builder.append("category");
+                String _firstUpper_21 = StringExtensions.toFirstUpper(category.getName());
+                _builder.append(_firstUpper_21, "\t\t");
+                _builder.append(".setParent(");
+                String _name_20 = tree.getName();
+                _builder.append(_name_20, "\t\t");
+                String _name_21 = entry.getName();
+                _builder.append(_name_21, "\t\t");
+                _builder.append(", ");
+                String _name_22 = tree.getName();
+                _builder.append(_name_22, "\t\t");
+                _builder.append(");");
+                _builder.newLineIfNotEmpty();
+                _builder.append("\t");
+                _builder.append("\t");
+                _builder.append("category");
+                String _firstUpper_22 = StringExtensions.toFirstUpper(category.getName());
+                _builder.append(_firstUpper_22, "\t\t");
+                _builder.append(".setChildrenAllowed(");
+                String _name_23 = tree.getName();
+                _builder.append(_name_23, "\t\t");
+                String _name_24 = entry.getName();
+                _builder.append(_name_24, "\t\t");
+                _builder.append(", false);");
+                _builder.newLineIfNotEmpty();
+                {
+                  boolean _isHasIcon = entry.isHasIcon();
+                  if (_isHasIcon) {
+                    _builder.append("\t");
+                    _builder.append("\t");
+                    _builder.append("category");
+                    String _firstUpper_23 = StringExtensions.toFirstUpper(category.getName());
+                    _builder.append(_firstUpper_23, "\t\t");
+                    _builder.append(".setItemIcon(");
+                    String _name_25 = tree.getName();
+                    _builder.append(_name_25, "\t\t");
+                    String _name_26 = entry.getName();
+                    _builder.append(_name_26, "\t\t");
+                    _builder.append(", themeResourceService.getThemeResource(\"");
+                    String _icon_1 = entry.getIcon();
+                    _builder.append(_icon_1, "\t\t");
+                    _builder.append("\", ThemeResourceType.ICON));");
                     _builder.newLineIfNotEmpty();
                   }
                 }
+                _builder.append("\t");
+                _builder.append("}");
+                _builder.newLine();
+                _builder.append("\t");
+                _builder.newLine();
               }
             }
           }
         }
-      }
-    }
-    _builder.append("// end depth: ");
-    _builder.append(depth);
-    _builder.newLineIfNotEmpty();
-    return _builder.toString();
-  }
-  
-  public String iterateMenu(final MenuEntry entry, final MenuEntry root, final int depth, final MenuPackage pkg, final String treeName) {
-    StringConcatenation _builder = new StringConcatenation();
-    {
-      boolean _isHasProcess = entry.isHasProcess();
-      if (_isHasProcess) {
-        _builder.append("if (bpmEngine != null && userAccessService.isGranted(Group.PROCESS, Action.STARTABLE, \"");
-        String _name = entry.getProcess().getName();
-        _builder.append(_name);
-        _builder.append("\")) {");
-        _builder.newLineIfNotEmpty();
-        _builder.append("\t");
-        _builder.append("UserMenuItem ");
-        _builder.append(treeName, "\t");
-        String _entryid = entry.getEntryid();
-        _builder.append(_entryid, "\t");
-        _builder.append(" = new UserMenuItem(\"");
-        String _entryid_1 = entry.getEntryid();
-        _builder.append(_entryid_1, "\t");
-        _builder.append("\", \"");
-        String _name_1 = entry.getProcess().getName();
-        _builder.append(_name_1, "\t");
-        _builder.append("\", UserMenuItemType.PROCESS);");
-        _builder.newLineIfNotEmpty();
-        _builder.append("\t");
-        _builder.append("items.put(");
-        _builder.append(treeName, "\t");
-        String _entryid_2 = entry.getEntryid();
-        _builder.append(_entryid_2, "\t");
-        _builder.append(", \"");
-        String _entryid_3 = entry.getEntryid();
-        _builder.append(_entryid_3, "\t");
-        _builder.append("\");");
-        _builder.newLineIfNotEmpty();
-        _builder.append("\t");
-        _builder.append(treeName, "\t");
-        _builder.append(".addItem(");
-        _builder.append(treeName, "\t");
-        String _entryid_4 = entry.getEntryid();
-        _builder.append(_entryid_4, "\t");
-        _builder.append(");");
-        _builder.newLineIfNotEmpty();
-        {
-          if (((depth > 1) && (root != null))) {
-            _builder.append("\t");
-            _builder.append(treeName, "\t");
-            _builder.append(".setParent(");
-            _builder.append(treeName, "\t");
-            String _entryid_5 = entry.getEntryid();
-            _builder.append(_entryid_5, "\t");
-            _builder.append(", ");
-            _builder.append(treeName, "\t");
-            String _entryid_6 = root.getEntryid();
-            _builder.append(_entryid_6, "\t");
-            _builder.append(");");
-            _builder.newLineIfNotEmpty();
-          }
-        }
-        {
-          if (((entry.getSubentries() != null) && (entry.getSubentries().size() > 0))) {
-            _builder.append("\t");
-            _builder.append(treeName, "\t");
-            _builder.append(".setChildrenAllowed(");
-            _builder.append(treeName, "\t");
-            String _entryid_7 = entry.getEntryid();
-            _builder.append(_entryid_7, "\t");
-            _builder.append(", true);");
-            _builder.newLineIfNotEmpty();
-          } else {
-            _builder.append("\t");
-            _builder.append(treeName, "\t");
-            _builder.append(".setChildrenAllowed(");
-            _builder.append(treeName, "\t");
-            String _entryid_8 = entry.getEntryid();
-            _builder.append(_entryid_8, "\t");
-            _builder.append(", false);");
-            _builder.newLineIfNotEmpty();
-          }
-        }
         _builder.append("}");
         _builder.newLine();
-      } else {
-        boolean _isHasUserFilter = entry.isHasUserFilter();
-        if (_isHasUserFilter) {
-          _builder.append("// userFilter");
-          _builder.newLine();
-          _builder.append("if (userAccessService.isSuperuser()) {");
-          _builder.newLine();
-          _builder.append("\t");
-          _builder.append("UserMenuItem ");
-          _builder.append(treeName, "\t");
-          String _entryid_9 = entry.getEntryid();
-          _builder.append(_entryid_9, "\t");
-          _builder.append("  = new UserMenuItem(");
-          _builder.append(treeName, "\t");
-          String _entryid_10 = entry.getEntryid();
-          _builder.append(_entryid_10, "\t");
-          _builder.append(" , \"\", UserMenuItemType.USERFILTER);  ");
-          _builder.newLineIfNotEmpty();
-          _builder.append("\t");
-          _builder.append("items.put(");
-          _builder.append(treeName, "\t");
-          String _entryid_11 = entry.getEntryid();
-          _builder.append(_entryid_11, "\t");
-          _builder.append(", \"");
-          _builder.append(treeName, "\t");
-          String _entryid_12 = entry.getEntryid();
-          _builder.append(_entryid_12, "\t");
-          _builder.append("\");");
-          _builder.newLineIfNotEmpty();
-          _builder.append("\t");
-          _builder.append("treeTasks.addItem(");
-          _builder.append(treeName, "\t");
-          String _entryid_13 = entry.getEntryid();
-          _builder.append(_entryid_13, "\t");
-          _builder.append(");");
-          _builder.newLineIfNotEmpty();
-          _builder.append("\t");
-          _builder.append("treeTasks.setParent(");
-          _builder.append(treeName, "\t");
-          String _entryid_14 = entry.getEntryid();
-          _builder.append(_entryid_14, "\t");
-          _builder.append(", ");
-          _builder.append(treeName, "\t");
-          String _entryid_15 = root.getEntryid();
-          _builder.append(_entryid_15, "\t");
-          _builder.append(");");
-          _builder.newLineIfNotEmpty();
-          _builder.append("\t");
-          _builder.append("treeTasks.setChildrenAllowed(");
-          _builder.append(treeName, "\t");
-          String _entryid_16 = entry.getEntryid();
-          _builder.append(_entryid_16, "\t");
-          _builder.append(", false);");
-          _builder.newLineIfNotEmpty();
-          _builder.append("}");
-          _builder.newLine();
-        } else {
-          _builder.append("UserMenuItem ");
-          _builder.append(treeName);
-          String _entryid_17 = entry.getEntryid();
-          _builder.append(_entryid_17);
-          _builder.append(" = new UserMenuItem(\"");
-          String _entryid_18 = entry.getEntryid();
-          _builder.append(_entryid_18);
-          _builder.append("\", ");
-          {
-            boolean _isHasProcess_1 = entry.isHasProcess();
-            if (_isHasProcess_1) {
-              _builder.append("\"");
-              String _name_2 = entry.getProcess().getName();
-              _builder.append(_name_2);
-              _builder.append("\"");
-            } else {
-              boolean _isHasPerspective = entry.isHasPerspective();
-              if (_isHasPerspective) {
-                _builder.append("\"");
-                QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(entry.getPerspective());
-                _builder.append(_fullyQualifiedName);
-                _builder.append("\"");
-              } else {
-                _builder.append("\"\"");
-              }
-            }
-          }
-          _builder.append(", UserMenuItemType.");
-          {
-            boolean _isHasProcess_2 = entry.isHasProcess();
-            if (_isHasProcess_2) {
-              _builder.append("PROCESS");
-            } else {
-              boolean _isHasPerspective_1 = entry.isHasPerspective();
-              if (_isHasPerspective_1) {
-                _builder.append("PERSPECTIVE");
-              } else {
-                _builder.append("NONE");
-              }
-            }
-          }
-          _builder.append(");  ");
-          _builder.newLineIfNotEmpty();
-          _builder.append("items.put(");
-          _builder.append(treeName);
-          String _entryid_19 = entry.getEntryid();
-          _builder.append(_entryid_19);
-          _builder.append(", \"");
-          String _entryid_20 = entry.getEntryid();
-          _builder.append(_entryid_20);
-          _builder.append("\");");
-          _builder.newLineIfNotEmpty();
-          _builder.append(treeName);
-          _builder.append(".addItem(");
-          _builder.append(treeName);
-          String _entryid_21 = entry.getEntryid();
-          _builder.append(_entryid_21);
-          _builder.append(");");
-          _builder.newLineIfNotEmpty();
-          {
-            if (((depth > 1) && (root != null))) {
-              _builder.append(treeName);
-              _builder.append(".setParent(");
-              _builder.append(treeName);
-              String _entryid_22 = entry.getEntryid();
-              _builder.append(_entryid_22);
-              _builder.append(", ");
-              _builder.append(treeName);
-              String _entryid_23 = root.getEntryid();
-              _builder.append(_entryid_23);
-              _builder.append(");");
-              _builder.newLineIfNotEmpty();
-            }
-          }
-          {
-            if (((entry.getSubentries() != null) && (entry.getSubentries().size() > 0))) {
-              _builder.append(treeName);
-              _builder.append(".setChildrenAllowed(");
-              _builder.append(treeName);
-              String _entryid_24 = entry.getEntryid();
-              _builder.append(_entryid_24);
-              _builder.append(", true);");
-              _builder.newLineIfNotEmpty();
-            } else {
-              _builder.append(treeName);
-              _builder.append(".setChildrenAllowed(");
-              _builder.append(treeName);
-              String _entryid_25 = entry.getEntryid();
-              _builder.append(_entryid_25);
-              _builder.append(", false);");
-              _builder.newLineIfNotEmpty();
-            }
-          }
-        }
-      }
-    }
-    {
-      EList<MenuEntry> _subentries = entry.getSubentries();
-      for(final MenuEntry e : _subentries) {
-        String _iterateMenu = this.iterateMenu(e, entry, (depth + 1), pkg, treeName);
-        _builder.append(_iterateMenu);
-        _builder.newLineIfNotEmpty();
       }
     }
     return _builder.toString();
   }
   
-  public CharSequence iterateTabs(final MenuEntry root, final int depth, final MenuPackage pkg, final String treeName) {
-    StringConcatenation _builder = new StringConcatenation();
-    {
-      EList<MenuEntry> _subentries = root.getSubentries();
-      for(final MenuEntry entry : _subentries) {
-        {
-          if ((((entry.getSubentries() != null) && (entry.getSubentries().size() != 0)) && ((depth == 0) || pkg.isSubMenuIsAccordion()))) {
-            String _iterateEntries = this.iterateEntries(entry.getSubentries(), StringExtensions.toFirstUpper(root.getEntryid()), (depth + 1), pkg);
-            _builder.append(_iterateEntries);
-            _builder.newLineIfNotEmpty();
-          }
-        }
-      }
-    }
-    return _builder;
-  }
-  
   public CharSequence setIcon(final MenuPackage pkg) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("Tab tab = accordion.getTab(selectedMap.get(accordion));");
@@ -1496,8 +1495,10 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
     _builder.append(", true);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
-    _builder.append("Component component = accRoot.getSelectedTab();");
-    _builder.newLine();
+    _builder.append("Component component = ");
+    _builder.append(accName, "\t\t");
+    _builder.append(".getSelectedTab();");
+    _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("if(component instanceof AbstractOrderedLayout) {");
     _builder.newLine();
@@ -1536,68 +1537,6 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
     return _builder;
   }
   
-  public CharSequence valueChangeHandler(final String entryName) {
-    StringConcatenation _builder = new StringConcatenation();
-    _builder.append(entryName);
-    _builder.append(".addValueChangeListener(new ValueChangeListener() {");
-    _builder.newLineIfNotEmpty();
-    _builder.append("\t");
-    _builder.append("@Override");
-    _builder.newLine();
-    _builder.append("\t");
-    _builder.append("public void valueChange(ValueChangeEvent event) {");
-    _builder.newLine();
-    _builder.append("\t\t");
-    _builder.append("if (");
-    _builder.append(entryName, "\t\t");
-    _builder.append(".getValue() != null) {");
-    _builder.newLineIfNotEmpty();
-    _builder.append("\t\t\t");
-    _builder.append("UserMenuItem item = (UserMenuItem)");
-    _builder.append(entryName, "\t\t\t");
-    _builder.append(".getValue();");
-    _builder.newLineIfNotEmpty();
-    _builder.append("\t\t\t");
-    _builder.append("if(item.getType() == UserMenuItemType.PROCESS) {");
-    _builder.newLine();
-    _builder.append("\t\t\t\t");
-    _builder.append("bpmnWindow.showBpmn(item.getCallId());");
-    _builder.newLine();
-    _builder.append("\t\t\t");
-    _builder.append("} ");
-    _builder.newLine();
-    _builder.append("\t\t\t");
-    _builder.append("else if(item.getType() == UserMenuItemType.PERSPECTIVE) {");
-    _builder.newLine();
-    _builder.append("\t\t\t\t");
-    _builder.append("bpmnWindow.closeBpmn();");
-    _builder.newLine();
-    _builder.append("\t\t\t\t");
-    _builder.append("log.debug(\"start perspective \"+item.getId());");
-    _builder.newLine();
-    _builder.append("\t\t\t\t");
-    _builder.append("EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.CLOSE, null, null);");
-    _builder.newLine();
-    _builder.append("\t\t\t\t");
-    _builder.append("eventDispatcher.sendEvent(evnt);");
-    _builder.newLine();
-    _builder.append("\t\t\t\t");
-    _builder.append("perspectiveProvider.openPerspective(item.getCallId());");
-    _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 localeChanged(final MenuPackage pkg) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("this.locale = locale;");
@@ -1615,7 +1554,7 @@ public class MenuDslJvmModelInferrer extends AbstractModelInferrer {
     _builder.append("for(UserMenuItem item: items.keySet()) {");
     _builder.newLine();
     _builder.append("\t");
-    _builder.append("item.setI18nId(dslMetadataService.translate(locale.toLanguageTag(),items.get(item)));");
+    _builder.append("item.setLocale(locale);");
     _builder.newLine();
     _builder.append("}");
     _builder.newLine();
diff --git a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.java b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.java
index c0ae64a..eab700f 100644
--- a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.java
+++ b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/jvmmodel/MenuModelGenerator.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,9 +16,10 @@
  */
 package org.eclipse.osbp.xtext.menu.jvmmodel;
 
-import com.google.common.base.Objects;
 import com.vaadin.data.Property;
+import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.AbstractOrderedLayout;
+import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
@@ -31,8 +34,6 @@ import com.vaadin.ui.VerticalLayout;
 import javax.inject.Inject;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.osbp.bpm.api.IBPMEngine;
@@ -46,17 +47,13 @@ import org.eclipse.osbp.ui.api.useraccess.IUserAccessService;
 import org.eclipse.osbp.utils.vaadin.bpmn.BpmnWindow;
 import org.eclipse.osbp.xtext.basic.generator.BasicDslGeneratorUtils;
 import org.eclipse.osbp.xtext.i18n.I18NModelGenerator;
-import org.eclipse.osbp.xtext.menu.MenuEntry;
-import org.eclipse.osbp.xtext.menu.MenuPackage;
 import org.eclipse.osbp.xtext.menu.common.UserMenuItem;
-import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.generator.IFileSystemAccess;
 import org.eclipse.xtext.xbase.compiler.GeneratorConfig;
 import org.eclipse.xtext.xbase.compiler.ImportManager;
 import org.eclipse.xtext.xbase.compiler.output.TreeAppendable;
 import org.eclipse.xtext.xbase.lib.Extension;
 import org.eclipse.xtext.xbase.lib.Pair;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.vaadin.hene.popupbutton.PopupButton;
 
 @SuppressWarnings("all")
@@ -71,65 +68,12 @@ public class MenuModelGenerator extends I18NModelGenerator {
     super.doGenerate(input, fsa);
   }
   
-  public String parseResource(final Resource resource) {
-    String str = "";
-    TreeIterator<EObject> it = resource.getAllContents();
-    while (it.hasNext()) {
-      {
-        EObject current = it.next();
-        if ((current instanceof MenuPackage)) {
-          EList<MenuEntry> _entries = ((MenuPackage) current).getEntries();
-          for (final MenuEntry entry : _entries) {
-            String _iterateEntry = this.iterateEntry(entry);
-            String _plus = (str + _iterateEntry);
-            str = _plus;
-          }
-        }
-      }
-    }
-    return str;
-  }
-  
-  public String iterateEntry(final MenuEntry entry) {
-    String str = "";
-    boolean _isHasTable = entry.isHasTable();
-    if (_isHasTable) {
-      str = (str + "\t");
-      StringConcatenation _builder = new StringConcatenation();
-      _builder.append("<reference bind=\"bind");
-      String _firstUpper = StringExtensions.toFirstUpper(entry.getTable().getName());
-      _builder.append(_firstUpper);
-      _builder.append("\" cardinality=\"0..1\" interface=\"org.eclipse.osbp.xtext.table.common.IViewEmbeddedProvider\" name=\"");
-      String _firstUpper_1 = StringExtensions.toFirstUpper(entry.getTable().getName());
-      _builder.append(_firstUpper_1);
-      _builder.append("\" policy=\"dynamic\" target=\"(type=");
-      String _firstUpper_2 = StringExtensions.toFirstUpper(entry.getTable().getName());
-      _builder.append(_firstUpper_2);
-      _builder.append(")\" unbind=\"unbind");
-      String _firstUpper_3 = StringExtensions.toFirstUpper(entry.getTable().getName());
-      _builder.append(_firstUpper_3);
-      _builder.append("\"/>");
-      _builder.newLineIfNotEmpty();
-      String _plus = (str + _builder);
-      str = _plus;
-    }
-    if (((!Objects.equal(entry.getSubentries(), null)) && (entry.getSubentries().size() > 0))) {
-      EList<MenuEntry> _subentries = entry.getSubentries();
-      for (final MenuEntry e : _subentries) {
-        String _iterateEntry = this.iterateEntry(e);
-        String _plus_1 = (str + _iterateEntry);
-        str = _plus_1;
-      }
-    }
-    return str;
-  }
-  
   @Override
   public TreeAppendable createAppendable(final EObject context, final ImportManager importManager, final GeneratorConfig config) {
     TreeAppendable _xblockexpression = null;
     {
       this.setBuilder(context.eResource());
-      this._basicDslGeneratorUtils.addImportFor(this, importManager, this._typeReferenceBuilder, VerticalLayout.class, HorizontalLayout.class, Label.class, Image.class, PopupButton.class, IUserMenuProvider.class, TabSheet.SelectedTabChangeListener.class, TabSheet.SelectedTabChangeEvent.class, Notification.class, IBlipBPMFunctionProvider.class, com.vaadin.server.Resource.class, TabSheet.Tab.class, Button.class, Accordion.class, IUserAccessService.class, IBPMEngine.class, AbstractAuthorization.Group.class, AbstractAuthorization.Action.class, IThemeResourceService.class, IThemeResourceService.ThemeResourceType.class, Tree.class, Property.ValueChangeListener.class, Property.ValueChangeEvent.class, UserMenuItem.class, UserMenuItem.UserMenuItemType.class, Button.ClickListener.class, Button.ClickEvent.class, IViewEmbeddedProvider.class, MApplication.class, ContextInjectionFactory.class, Pair.class, UI.class, AbstractOrderedLayout.class, EventDispatcherEvent.EventDispatcherDataTag.class, EventDispatcherEvent.EventDispatcherCommand.class, EventDispatcherEvent.class, MenuBar.class, MenuBar.MenuItem.class, BpmnWindow.class);
+      this._basicDslGeneratorUtils.addImportFor(this, importManager, this._typeReferenceBuilder, VerticalLayout.class, HorizontalLayout.class, AbsoluteLayout.class, Label.class, Image.class, PopupButton.class, IUserMenuProvider.class, TabSheet.SelectedTabChangeListener.class, TabSheet.SelectedTabChangeEvent.class, Notification.class, IBlipBPMFunctionProvider.class, com.vaadin.server.Resource.class, TabSheet.Tab.class, Button.class, Accordion.class, IUserAccessService.class, IBPMEngine.class, AbstractAuthorization.Group.class, AbstractAuthorization.Action.class, IThemeResourceService.class, IThemeResourceService.ThemeResourceType.class, Tree.class, Property.ValueChangeListener.class, Property.ValueChangeEvent.class, UserMenuItem.class, UserMenuItem.UserMenuItemType.class, Button.ClickListener.class, Button.ClickEvent.class, IViewEmbeddedProvider.class, MApplication.class, ContextInjectionFactory.class, Pair.class, UI.class, AbstractOrderedLayout.class, EventDispatcherEvent.EventDispatcherDataTag.class, EventDispatcherEvent.EventDispatcherCommand.class, EventDispatcherEvent.class, MenuBar.class, MenuBar.MenuItem.class, BpmnWindow.class, AbstractSelect.ItemDescriptionGenerator.class, Tree.TreeDragMode.class);
       _xblockexpression = super.createAppendable(context, importManager, config);
     }
     return _xblockexpression;
diff --git a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.java b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.java
index 46a393f..8bd85c5 100644
--- a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.java
+++ b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/scoping/MenuDSLScopeProvider.java
@@ -3,7 +3,19 @@
  */
 package org.eclipse.osbp.xtext.menu.scoping;
 
+import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.osbp.xtext.dialogdsl.Dialog;
+import org.eclipse.osbp.xtext.menu.MenuDslPackage;
 import org.eclipse.osbp.xtext.menu.scoping.AbstractMenuDslScopeProvider;
+import org.eclipse.osbp.xtext.table.Table;
+import org.eclipse.xtext.resource.IEObjectDescription;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.impl.FilteringScope;
 
 /**
  * This class contains custom scoping description.
@@ -13,4 +25,67 @@ import org.eclipse.osbp.xtext.menu.scoping.AbstractMenuDslScopeProvider;
  */
 @SuppressWarnings("all")
 public class MenuDslScopeProvider extends AbstractMenuDslScopeProvider {
+  @Override
+  public IScope getScope(final EObject context, final EReference reference) {
+    boolean _equals = Objects.equal(reference, MenuDslPackage.Literals.MENU_CATEGORY__DIALOG);
+    if (_equals) {
+      return this.getEmbeddedDialog(context, reference);
+    } else {
+      boolean _equals_1 = Objects.equal(reference, MenuDslPackage.Literals.MENU_CATEGORY__TABLE);
+      if (_equals_1) {
+        return this.getEmbeddedTable(context, reference);
+      } else {
+        final IScope scope = super.getScope(context, reference);
+        return scope;
+      }
+    }
+  }
+  
+  public IScope getEmbeddedDialog(final EObject context, final EReference reference) {
+    IScope _scope = super.getScope(context, reference);
+    final Predicate<IEObjectDescription> _function = (IEObjectDescription it) -> {
+      final EObject entityProxy = it.getEObjectOrProxy();
+      Dialog dialog = null;
+      boolean _eIsProxy = entityProxy.eIsProxy();
+      if (_eIsProxy) {
+        final URI uri = ((InternalEObject) entityProxy).eProxyURI();
+        EObject _eObject = context.eResource().getResourceSet().getEObject(uri, true);
+        dialog = ((Dialog) _eObject);
+      } else {
+        dialog = ((Dialog) entityProxy);
+      }
+      if ((dialog != null)) {
+        boolean _isEmbedded = dialog.isEmbedded();
+        if (_isEmbedded) {
+          return true;
+        }
+      }
+      return false;
+    };
+    return new FilteringScope(_scope, _function);
+  }
+  
+  public IScope getEmbeddedTable(final EObject context, final EReference reference) {
+    IScope _scope = super.getScope(context, reference);
+    final Predicate<IEObjectDescription> _function = (IEObjectDescription it) -> {
+      final EObject entityProxy = it.getEObjectOrProxy();
+      Table table = null;
+      boolean _eIsProxy = entityProxy.eIsProxy();
+      if (_eIsProxy) {
+        final URI uri = ((InternalEObject) entityProxy).eProxyURI();
+        EObject _eObject = context.eResource().getResourceSet().getEObject(uri, true);
+        table = ((Table) _eObject);
+      } else {
+        table = ((Table) entityProxy);
+      }
+      if ((table != null)) {
+        boolean _isEmbedded = table.getTabletype().isEmbedded();
+        if (_isEmbedded) {
+          return true;
+        }
+      }
+      return false;
+    };
+    return new FilteringScope(_scope, _function);
+  }
 }
diff --git a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.java b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.java
index ec9e81f..b3d7b65 100644
--- a/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.java
+++ b/org.eclipse.osbp.xtext.menu/xtend-gen/org/eclipse/osbp/xtext/menu/validation/MenuDslValidator.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/pom.xml b/pom.xml
index 636d053..a054b2d 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 API and implementation -->
author	Ralf Mollik	2018-06-28 15:01:19 +0000
committer	Ralf Mollik	2018-06-28 15:01:19 +0000
commit	38b051786c950677afdf941bcd71d3461f80d798 (patch)
tree	a9570dbb5f07d0dd2cc49fe68c71eb1f0ed77996
parent	4035f374625162807f3eef16d3d7fd353aa43858 (diff)
download	org.eclipse.osbp.xtext.menu-38b051786c950677afdf941bcd71d3461f80d798.tar.gz org.eclipse.osbp.xtext.menu-38b051786c950677afdf941bcd71d3461f80d798.tar.xz org.eclipse.osbp.xtext.menu-38b051786c950677afdf941bcd71d3461f80d798.zip