diff --git a/ERtext.plugin/ERtext-plugin.zip b/ERtext.plugin/ERtext-plugin.zip
index 4445de6..e8cf9b5 100644
Binary files a/ERtext.plugin/ERtext-plugin.zip and b/ERtext.plugin/ERtext-plugin.zip differ
diff --git a/org.xtext.unipampa.erdsl.ertext.feature/feature.xml b/org.xtext.unipampa.erdsl.ertext.feature/feature.xml
index 2cd1a17..8646b1f 100644
--- a/org.xtext.unipampa.erdsl.ertext.feature/feature.xml
+++ b/org.xtext.unipampa.erdsl.ertext.feature/feature.xml
@@ -1,180 +1,381 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.xtext.unipampa.erdsl.ertext.feature"
-      label="ERtext"
+      label="org.xtext.unipampa.erdsl.ertext"
       version="1.0.0.qualifier"
       provider-name="UNIPAMPA - LESSE">
 
    <description url="https://github.com/ProjetoDSL/ERDSL">
       This plugin is a Domain-Specific Language tool implementation for the conceptual modeling and design of relational databases.
 
-The project for this product is publicly available under the EPL-2.0 license in a GitHub repository (github.com/ProjetoDSL/ERDSL), belonging to the Laboratory of Empirical Studies in Software Engineering (LESSE) research group of the Federal University of Pampa (UNIPAMPA).
+The project for this product is publicly available under the EPL-2.0 license, belonging to the Laboratory of Empirical Studies in Software Engineering (LESSE) research group of the Federal University of Pampa (UNIPAMPA).
 
 2019-2022
    </description>
 
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
    <license url="https://www.eclipse.org/legal/epl-2.0/">
       Eclipse Public License - v 2.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&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
 
 1. DEFINITIONS
-“Contribution” means:
 
-a) in the case of the initial Contributor, the initial content 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&apos;s behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
-“Contributor” means any person or entity that Distributes the Program.
+&quot;Contribution&quot; means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
 
-“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.
+  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
+  &quot;originates&quot; from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor&apos;s behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
 
-“Program” means the Contributions Distributed in accordance with this Agreement.
+&quot;Contributor&quot; means any person or entity that Distributes the Program.
 
-“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+&quot;Licensed Patents&quot; 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.
 
-“Derivative Works” 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.
+&quot;Program&quot; means the Contributions Distributed in accordance with this
+Agreement.
 
-“Modified Works” 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.
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
 
-“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+&quot;Derivative Works&quot; 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.
 
-“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+&quot;Modified Works&quot; 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.
 
-“Secondary License” 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.
+&quot;Distribute&quot; means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+&quot;Source Code&quot; means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+&quot;Secondary License&quot; 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.
 
 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.
-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.
-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&apos;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.
-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&apos;s receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+  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.
+
+  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.
+
+  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&apos;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.
+
+  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&apos;s
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
 3. REQUIREMENTS
+
 3.1 If a Contributor Distributes the Program in any form, then:
 
-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
-b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
-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;
-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;
-iii) does not attempt to limit or alter the recipients&apos; rights in the Source Code under section 3.2; and
-iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
-3.2 When the Program is Distributed as Source Code:
+  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
 
-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
-b) a copy of this Agreement must be included with each copy of the Program.
-3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (‘notices’) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     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;
 
-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.
+     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;
 
-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&apos;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.
+     iii) does not attempt to limit or alter the recipients&apos; rights
+     in the Source Code under section 3.2; and
 
-5. NO WARRANTY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, 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.
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
 
-6. DISCLAIMER OF LIABILITY
-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.
+3.2 When the Program is Distributed as Source Code:
 
-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.
+  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
 
-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&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
 
-All Recipient&apos;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&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability (&quot;notices&quot;) contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
 
-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.
+4. COMMERCIAL DISTRIBUTION
 
-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.
+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
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every
+other Contributor (&quot;Indemnified Contributor&quot;) against any losses,
+damages and costs (collectively &quot;Losses&quot;) 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&apos;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.
 
-Exhibit A – Form of Secondary Licenses Notice
-“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}.”
+5. NO WARRANTY
 
-Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot;
+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.
 
-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.
+6. DISCLAIMER OF LIABILITY
 
-You may add additional accurate notices of copyright ownership.
+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.
+
+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&apos;s patent(s), then such Recipient&apos;s
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient&apos;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&apos;s
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient&apos;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. 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.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+&quot;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}.&quot;
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  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.
+
+  You may add additional accurate notices of copyright ownership.
    </license>
 
    <plugin
-         id="net.sourceforge.plantuml.jdt"
+         id="net.sourceforge.plantuml.eclipse"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.xtext.unipampa.erdsl.ui.tests"
+         id="net.sourceforge.plantuml.eclipse.imagecontrol"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="net.sourceforge.plantuml.text"
+         id="net.sourceforge.plantuml.jdt"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="net.sourceforge.plantuml.eclipse.imagecontrol"
+         id="net.sourceforge.plantuml.lib"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="net.sourceforge.plantuml.lib"
+         id="net.sourceforge.plantuml.svg"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="net.sourceforge.plantuml.svg"
+         id="net.sourceforge.plantuml.text"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="de.jcup.sqleditor"
+         id="org.xtext.unipampa.erdsl"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.xtext.unipampa.erdsl"
+         id="org.xtext.unipampa.erdsl.ide"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.xtext.unipampa.erdsl.ide"
+         id="org.xtext.unipampa.erdsl.tests"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="net.sourceforge.plantuml.eclipse"
+         id="org.xtext.unipampa.erdsl.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.xtext.unipampa.erdsl.ui"
+         id="org.xtext.unipampa.erdsl.ui.tests"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.xtext.unipampa.erdsl.tests"
+         id="de.jcup.sqleditor"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.xtext.unipampa.erdsl.ertext.update/artifacts.jar b/org.xtext.unipampa.erdsl.ertext.update/artifacts.jar
index 4ad4548..fce3c5a 100644
Binary files a/org.xtext.unipampa.erdsl.ertext.update/artifacts.jar and b/org.xtext.unipampa.erdsl.ertext.update/artifacts.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/content.jar b/org.xtext.unipampa.erdsl.ertext.update/content.jar
index 62289a6..7ede5eb 100644
Binary files a/org.xtext.unipampa.erdsl.ertext.update/content.jar and b/org.xtext.unipampa.erdsl.ertext.update/content.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202041958.jar b/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202041958.jar
deleted file mode 100644
index 95b850a..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202041958.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202042012.jar b/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202042012.jar
deleted file mode 100644
index 839aee2..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202042012.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202090133.jar b/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202090133.jar
new file mode 100644
index 0000000..4ee02cb
Binary files /dev/null and b/org.xtext.unipampa.erdsl.ertext.update/features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202090133.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/index.html b/org.xtext.unipampa.erdsl.ertext.update/index.html
deleted file mode 100644
index df9bd43..0000000
--- a/org.xtext.unipampa.erdsl.ertext.update/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<title>org.xtext.unipampa.erdsl.ertext.update</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>@import url("web/site.css");</style>
-<script type="text/javascript">
-	var returnval = 0;
-	var stylesheet, xmlFile, cache, doc;
-	function init(){
-		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari
-		// Use the standard DOM Level 2 technique, if it is supported
-		if (document.implementation && document.implementation.createDocument) {
-			xmlFile = document.implementation.createDocument("", "", null);
-			stylesheet = document.implementation.createDocument("", "", null);
-			if (xmlFile.load){
-				xmlFile.load("site.xml");
-				stylesheet.load("web/site.xsl");
-			} else {
-				alert("Document could not be loaded by browser.");
-			}
-			xmlFile.addEventListener("load", transform, false);
-			stylesheet.addEventListener("load", transform, false);
-		}
-		//IE 6.0+ solution
-		else if (window.ActiveXObject) {
-			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
-			xmlFile.async = false;
-			xmlFile.load("site.xml");
-			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
-			stylesheet.async = false;
-			stylesheet.load("web/site.xsl");
-			cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
-			cache.stylesheet = stylesheet;
-			transformData();
-		}
-	}
-	// separate transformation function for IE 6.0+
-	function transformData(){
-		var processor = cache.createProcessor();
-		processor.input = xmlFile;
-		processor.transform();
-		data.innerHTML = processor.output;
-	}
-	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ 
-	function transform(){
-		returnval+=1;
-		if (returnval==2){
-			var processor = new XSLTProcessor();
-			processor.importStylesheet(stylesheet); 
-			doc = processor.transformToDocument(xmlFile);
-			document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
-		}
-	}
-</script>
-</head>
-<body onload="init();">
-<!--[insert static HTML here]-->
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202041958.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202041958.jar
deleted file mode 100644
index cf794b4..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202041958.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202042012.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202090133.jar
similarity index 84%
rename from org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202042012.jar
rename to org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202090133.jar
index d965f60..1c4747f 100644
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202042012.jar and b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ide_1.0.0.202202090133.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202041958.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202041958.jar
deleted file mode 100644
index e0cd454..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202041958.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202042012.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202042012.jar
deleted file mode 100644
index a8a3015..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202042012.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202090133.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202090133.jar
new file mode 100644
index 0000000..914d95d
Binary files /dev/null and b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.tests_1.0.0.202202090133.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202041958.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202041958.jar
deleted file mode 100644
index 8423b05..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202041958.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202042012.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202042012.jar
deleted file mode 100644
index 887506f..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202042012.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202090133.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202090133.jar
new file mode 100644
index 0000000..282008b
Binary files /dev/null and b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui.tests_1.0.0.202202090133.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202041958.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202041958.jar
deleted file mode 100644
index 4c6541b..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202041958.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202042012.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202042012.jar
deleted file mode 100644
index ad7f66e..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202042012.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202090133.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202090133.jar
new file mode 100644
index 0000000..1ba7972
Binary files /dev/null and b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl.ui_1.0.0.202202090133.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202042012.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202042012.jar
deleted file mode 100644
index 6cf8149..0000000
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202042012.jar and /dev/null differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202041958.jar b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202090133.jar
similarity index 89%
rename from org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202041958.jar
rename to org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202090133.jar
index 6019220..ef0fc47 100644
Binary files a/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202041958.jar and b/org.xtext.unipampa.erdsl.ertext.update/plugins/org.xtext.unipampa.erdsl_1.0.0.202202090133.jar differ
diff --git a/org.xtext.unipampa.erdsl.ertext.update/site.xml b/org.xtext.unipampa.erdsl.ertext.update/site.xml
index d0b1bee..0e94ff8 100644
--- a/org.xtext.unipampa.erdsl.ertext.update/site.xml
+++ b/org.xtext.unipampa.erdsl.ertext.update/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202042012.jar" id="org.xtext.unipampa.erdsl.ertext.feature" version="1.0.0.202202042012" os="">
+   <feature url="features/org.xtext.unipampa.erdsl.ertext.feature_1.0.0.202202090133.jar" id="org.xtext.unipampa.erdsl.ertext.feature" version="1.0.0.202202090133">
       <category name="ERtext"/>
    </feature>
    <category-def name="ERtext" label="ERtext"/>
diff --git a/org.xtext.unipampa.erdsl.ertext.update/web/site.css b/org.xtext.unipampa.erdsl.ertext.update/web/site.css
deleted file mode 100644
index 62c6f9f..0000000
--- a/org.xtext.unipampa.erdsl.ertext.update/web/site.css
+++ /dev/null
@@ -1,12 +0,0 @@
-<STYLE type="text/css">
-td.spacer {padding-bottom: 10px; padding-top: 10px;}
-.title { font-family: sans-serif; color: #99AACC;}
-.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }
-.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
-.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
-.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
-.light-row {background:#FFFFFF}
-.dark-row {background:#EEEEFF}
-.header {background:#99AADD}
-#indent {word-wrap : break-word;width :300px;text-indent:10px;}
-</STYLE>
diff --git a/org.xtext.unipampa.erdsl.ertext.update/web/site.xsl b/org.xtext.unipampa.erdsl.ertext.update/web/site.xsl
deleted file mode 100644
index 4899f97..0000000
--- a/org.xtext.unipampa.erdsl.ertext.update/web/site.xsl
+++ /dev/null
@@ -1,214 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<xsl:output method="html" encoding="UTF-8"/>
-<xsl:key name="cat" match="category" use="@name"/>
-<xsl:template match="/">
-<xsl:for-each select="site">
-	<html>
-	<head>
-	<title>org.xtext.unipampa.erdsl.ertext.update</title>
-	<style>@import url("web/site.css");</style>
-	</head>
-	<body>
-	<h1 class="title">org.xtext.unipampa.erdsl.ertext.update</h1>
-	<p class="bodyText"><xsl:value-of select="description"/></p>
-	<table width="100%" border="0" cellspacing="1" cellpadding="2">
-	<xsl:for-each select="category-def">
-		<xsl:sort select="@label" order="ascending" case-order="upper-first"/>
-		<xsl:sort select="@name" order="ascending" case-order="upper-first"/>
-	<xsl:if test="count(key('cat',@name)) != 0">
-			<tr class="header">
-				<td class="sub-header" width="30%">
-					<xsl:value-of select="@name"/>
-				</td>
-				<td class="sub-header" width="70%">
-					<xsl:value-of select="@label"/>
-				</td>
-			</tr>
-			<xsl:for-each select="key('cat',@name)">
-			<xsl:sort select="ancestor::feature//@version" order="ascending"/>
-			<xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
-			<tr>
-				<xsl:choose>
-				<xsl:when test="(position() mod 2 = 1)">
-					<xsl:attribute name="class">dark-row</xsl:attribute>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="class">light-row</xsl:attribute>
-				</xsl:otherwise>
-				</xsl:choose>
-				<td class="log-text" id="indent">
-						<xsl:choose>
-						<xsl:when test="ancestor::feature//@label">
-							<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
-							<br/>
-							<div id="indent">
-							(<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
-							</div>
-						</xsl:when>
-						<xsl:otherwise>
-						<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
-						</xsl:otherwise>
-						</xsl:choose>
-						<br />
-				</td>
-				<td>
-					<table>
-						<xsl:if test="ancestor::feature//@os">
-							<tr><td class="log-text" id="indent">Operating Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@ws">
-							<tr><td class="log-text" id="indent">Windows Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@nl">
-							<tr><td class="log-text" id="indent">Languages:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@arch">
-							<tr><td class="log-text" id="indent">Architecture:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
-							</tr>
-						</xsl:if>
-					</table>
-				</td>
-			</tr>
-			</xsl:for-each>
-			<tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
-		</xsl:if>
-	</xsl:for-each>
-	<xsl:if test="count(feature)  &gt; count(feature/category)">
-	<tr class="header">
-		<td class="sub-header" colspan="2">
-		Uncategorized
-		</td>
-	</tr>
-	</xsl:if>
-	<xsl:choose>
-	<xsl:when test="function-available('msxsl:node-set')">
-	   <xsl:variable name="rtf-nodes">
-		<xsl:for-each select="feature[not(category)]">
-			<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-			<xsl:sort select="@version" order="ascending" />
-			<xsl:value-of select="."/>
-			<xsl:copy-of select="." />
-		</xsl:for-each>
-	   </xsl:variable>
-	   <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
-	<xsl:for-each select="$myNodeSet">
-	<tr>
-		<xsl:choose>
-		<xsl:when test="position() mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:when>
-	<xsl:otherwise>
-	<xsl:for-each select="feature[not(category)]">
-	<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-	<xsl:sort select="@version" order="ascending" />
-	<tr>
-		<xsl:choose>
-		<xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:otherwise>
-	</xsl:choose>
-	</table>
-	</body>
-	</html>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin
index 4d244dc..4ee81e3 100644
Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin
index 8266469..ff8e27c 100644
Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin
index 4d244dc..4ee81e3 100644
Binary files a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin and b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin
index 8266469..ff8e27c 100644
Binary files a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin and b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin b/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin
index 6c72a47..783b7c7 100644
Binary files a/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin and b/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin b/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin
index 6c72a47..783b7c7 100644
Binary files a/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin and b/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/META-INF/MANIFEST.MF b/org.xtext.unipampa.erdsl.ui/META-INF/MANIFEST.MF
index 8965906..1c0096b 100644
--- a/org.xtext.unipampa.erdsl.ui/META-INF/MANIFEST.MF
+++ b/org.xtext.unipampa.erdsl.ui/META-INF/MANIFEST.MF
@@ -26,8 +26,13 @@ Require-Bundle: org.xtext.unipampa.erdsl,
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.ui.codemining;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.xtext.unipampa.erdsl.ui.contentassist,
+Export-Package: org.xtext.unipampa.erdsl.ui,
+ org.xtext.unipampa.erdsl.ui.codemining,
+ org.xtext.unipampa.erdsl.ui.contentassist,
  org.xtext.unipampa.erdsl.ui.internal,
+ org.xtext.unipampa.erdsl.ui.labeling,
+ org.xtext.unipampa.erdsl.ui.outline,
  org.xtext.unipampa.erdsl.ui.quickfix,
- org.xtext.unipampa.erdsl.ui.wizard
+ org.xtext.unipampa.erdsl.ui.wizard,
+ org.xtext.unipampa.erdsl.validation
 Bundle-Activator: org.xtext.unipampa.erdsl.ui.internal.ErdslActivator
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin
index 83f1c50..d6582a1 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin
index fd9a5aa..58d3f8c 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin
index 0a08663..2833fe7 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin
index b14eb5c..e736c37 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin
index 276f227..eafb0e5 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin
index b357c07..7bc54bd 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin
index 5e3aaa4..945fe40 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace
index 0fc6725..4982450 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace
index 05aa063..39492cb 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin
index e9cf588..50edf6b 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin
index 9ad063d..14433fd 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.class b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.class
index 241befa..39bdaa9 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.class and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.class differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.class b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.class
index 0563164..eab405f 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.class and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.class differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend
index e69039b..f832bfb 100644
--- a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend
+++ b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend
@@ -22,12 +22,12 @@ class ErDslFileTemplateProvider implements IFileTemplateProvider {
 //@FileTemplate(label="Hello World", icon="file_template.png", description="Create a hello world for ERDSl.")
 //final class HelloWorldFile {
 //	val helloName = combo("Hello Name:", #["Xtext", "World", "Foo", "Bar"], "The name to say 'Hello' to")
-@FileTemplate(label="ERDSL Template", icon="file_template.png", description="Create a template file for ERDSl.")
+@FileTemplate(label="ERtext Template", icon="file_template.png", description="Create a template file for ERtext.")
 final class ERtextFile {
-	val modelName = combo("Template:", #["Empty Model"], "The empty model")
+	val modelName = combo("Template:", #["Template Model"], "The template model")
 	override generateFiles(IFileGenerator generator) {
 		generator.generate('''«folder»/«name».erdsl''', '''
-		«IF modelName.toString.equalsIgnoreCase("Empty Model")»
+		«IF modelName.toString.equalsIgnoreCase("Template Model")»
 			/*
 			* The template to demonstrate an overview of the grammar. 
 			* This does not necessarily displays a semantically correct model regarding to the real world.
@@ -35,12 +35,12 @@ final class ERtextFile {
 			
 			Generate All;
 			
-			Domain Name;
+			Domain TemplateModel;
 			
 			Entities {
-				Entity1 {
-			    	attribute1 int isIdentifier,
-			        attribute2 file
+				EntA {
+			    	att1 int isIdentifier,
+			        att2 file
 				}
 			                    
 			    /*  The generalization type can be:
@@ -48,16 +48,34 @@ final class ERtextFile {
 			    * 
 			    * 	An entity that specializes another should NOT HAVE an IDENTIFIER attribute, as it inherits from the generalized entity.
 			    */
-				Entity2 is total/disjoint Entity1 {
-			    	attribute3 string,
-					attribute4 datetime
+				EntB is total/disjoint EntA {
+			    	att3 string,
+					att4 datetime
+				}
+				
+				EntC {
+					att5 int isIdentifier,
+					att6 string
+				}
+				
+				EntD {
+					att7 int isIdentifier,
+					att8 money
+				}
+				
+				EntE {
+					att9 int isIdentifier
 				}
 			};
 			
 			Relationships {
-					Relationship1 [Entity1 (1:N) relates (1:N) Entity2] {attribute5 int}
-					Relationship2 [Entity2 (1:N) relates (1:N) Entity1]	
+					R1 [EntA (1:N) relates (1:N) EntA] {attr1 int}	
+					R2 [EntC (1:1) relates (1:1) EntD]
+					R3 [EntD (0:N) relates (1:N) EntC]
+					R4 [R3 (1:1) relates (1:N) EntE] //This is a ternary relationship
+					
 			};
+			
 		«ENDIF»
 		''')
 	}
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend
index 1ea9cb0..5b0fdb8 100644
--- a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend
+++ b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend
@@ -66,12 +66,12 @@ final class ERtextProject {
 			
 			Generate All;
 			
-			Domain Name;
+			Domain TemplateModel;
 			
 			Entities {
-				Entity1 {
-			    	attribute1 int isIdentifier,
-			        attribute2 file
+				EntA {
+			    	att1 int isIdentifier,
+			        att2 file
 				}
 			                    
 			    /*  The generalization type can be:
@@ -79,16 +79,34 @@ final class ERtextProject {
 			    * 
 			    * 	An entity that specializes another should NOT HAVE an IDENTIFIER attribute, as it inherits from the generalized entity.
 			    */
-				Entity2 is total/disjoint Entity1 {
-			    	attribute3 string,
-					attribute4 datetime
+				EntB is total/disjoint EntA {
+			    	att3 string,
+					att4 datetime
+				}
+				
+				EntC {
+					att5 int isIdentifier,
+					att6 string
+				}
+				
+				EntD {
+					att7 int isIdentifier,
+					att8 money
+				}
+				
+				EntE {
+					att9 int isIdentifier
 				}
 			};
 			
 			Relationships {
-					Relationship1 [Entity1 (1:N) relates (1:N) Entity2] {attribute5 int}
-					Relationship2 [Entity2 (1:N) relates (1:N) Entity1]	
+					R1 [EntA (1:N) relates (1:N) EntA] {attr1 int}	
+					R2 [EntC (1:1) relates (1:1) EntD]
+					R3 [EntD (0:N) relates (1:N) EntC]
+					R4 [R3 (1:1) relates (1:N) EntE] //This is a ternary relationship
+					
 			};
+
 			''')
 		])
 	}
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/messages.properties b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/messages.properties
index 869a50d..09bf9df 100644
--- a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/messages.properties
+++ b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/messages.properties
@@ -1,4 +1,4 @@
-ERtextFile_Label=ERDSL Template
-ERtextFile_Description=Create a template file for ERDSl.
+ERtextFile_Label=ERtext Template
+ERtextFile_Description=Create a template file for ERtext.
 ERtextProject_Label=org.project.ertext.template
 ERtextProject_Description=<p><b> ERtext Project Template</b></p>  <p>This is a parameterized project template for ERtext. You can set a parameter to modify the content in the generated file and a parameter  to set the package the file is created in.</p>
diff --git a/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend b/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend
index e69039b..f832bfb 100644
--- a/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend
+++ b/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslFileTemplateProvider.xtend
@@ -22,12 +22,12 @@ class ErDslFileTemplateProvider implements IFileTemplateProvider {
 //@FileTemplate(label="Hello World", icon="file_template.png", description="Create a hello world for ERDSl.")
 //final class HelloWorldFile {
 //	val helloName = combo("Hello Name:", #["Xtext", "World", "Foo", "Bar"], "The name to say 'Hello' to")
-@FileTemplate(label="ERDSL Template", icon="file_template.png", description="Create a template file for ERDSl.")
+@FileTemplate(label="ERtext Template", icon="file_template.png", description="Create a template file for ERtext.")
 final class ERtextFile {
-	val modelName = combo("Template:", #["Empty Model"], "The empty model")
+	val modelName = combo("Template:", #["Template Model"], "The template model")
 	override generateFiles(IFileGenerator generator) {
 		generator.generate('''«folder»/«name».erdsl''', '''
-		«IF modelName.toString.equalsIgnoreCase("Empty Model")»
+		«IF modelName.toString.equalsIgnoreCase("Template Model")»
 			/*
 			* The template to demonstrate an overview of the grammar. 
 			* This does not necessarily displays a semantically correct model regarding to the real world.
@@ -35,12 +35,12 @@ final class ERtextFile {
 			
 			Generate All;
 			
-			Domain Name;
+			Domain TemplateModel;
 			
 			Entities {
-				Entity1 {
-			    	attribute1 int isIdentifier,
-			        attribute2 file
+				EntA {
+			    	att1 int isIdentifier,
+			        att2 file
 				}
 			                    
 			    /*  The generalization type can be:
@@ -48,16 +48,34 @@ final class ERtextFile {
 			    * 
 			    * 	An entity that specializes another should NOT HAVE an IDENTIFIER attribute, as it inherits from the generalized entity.
 			    */
-				Entity2 is total/disjoint Entity1 {
-			    	attribute3 string,
-					attribute4 datetime
+				EntB is total/disjoint EntA {
+			    	att3 string,
+					att4 datetime
+				}
+				
+				EntC {
+					att5 int isIdentifier,
+					att6 string
+				}
+				
+				EntD {
+					att7 int isIdentifier,
+					att8 money
+				}
+				
+				EntE {
+					att9 int isIdentifier
 				}
 			};
 			
 			Relationships {
-					Relationship1 [Entity1 (1:N) relates (1:N) Entity2] {attribute5 int}
-					Relationship2 [Entity2 (1:N) relates (1:N) Entity1]	
+					R1 [EntA (1:N) relates (1:N) EntA] {attr1 int}	
+					R2 [EntC (1:1) relates (1:1) EntD]
+					R3 [EntD (0:N) relates (1:N) EntC]
+					R4 [R3 (1:1) relates (1:N) EntE] //This is a ternary relationship
+					
 			};
+			
 		«ENDIF»
 		''')
 	}
diff --git a/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend b/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend
index 1ea9cb0..5b0fdb8 100644
--- a/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend
+++ b/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/ErDslProjectTemplateProvider.xtend
@@ -66,12 +66,12 @@ final class ERtextProject {
 			
 			Generate All;
 			
-			Domain Name;
+			Domain TemplateModel;
 			
 			Entities {
-				Entity1 {
-			    	attribute1 int isIdentifier,
-			        attribute2 file
+				EntA {
+			    	att1 int isIdentifier,
+			        att2 file
 				}
 			                    
 			    /*  The generalization type can be:
@@ -79,16 +79,34 @@ final class ERtextProject {
 			    * 
 			    * 	An entity that specializes another should NOT HAVE an IDENTIFIER attribute, as it inherits from the generalized entity.
 			    */
-				Entity2 is total/disjoint Entity1 {
-			    	attribute3 string,
-					attribute4 datetime
+				EntB is total/disjoint EntA {
+			    	att3 string,
+					att4 datetime
+				}
+				
+				EntC {
+					att5 int isIdentifier,
+					att6 string
+				}
+				
+				EntD {
+					att7 int isIdentifier,
+					att8 money
+				}
+				
+				EntE {
+					att9 int isIdentifier
 				}
 			};
 			
 			Relationships {
-					Relationship1 [Entity1 (1:N) relates (1:N) Entity2] {attribute5 int}
-					Relationship2 [Entity2 (1:N) relates (1:N) Entity1]	
+					R1 [EntA (1:N) relates (1:N) EntA] {attr1 int}	
+					R2 [EntC (1:1) relates (1:1) EntD]
+					R3 [EntD (0:N) relates (1:N) EntC]
+					R4 [R3 (1:1) relates (1:N) EntE] //This is a ternary relationship
+					
 			};
+
 			''')
 		])
 	}
diff --git a/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/messages.properties b/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/messages.properties
index 869a50d..09bf9df 100644
--- a/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/messages.properties
+++ b/org.xtext.unipampa.erdsl.ui/src/org/xtext/unipampa/erdsl/ui/wizard/messages.properties
@@ -1,4 +1,4 @@
-ERtextFile_Label=ERDSL Template
-ERtextFile_Description=Create a template file for ERDSl.
+ERtextFile_Label=ERtext Template
+ERtextFile_Description=Create a template file for ERtext.
 ERtextProject_Label=org.project.ertext.template
 ERtextProject_Description=<p><b> ERtext Project Template</b></p>  <p>This is a parameterized project template for ERtext. You can set a parameter to modify the content in the generated file and a parameter  to set the package the file is created in.</p>
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin
index 83f1c50..d6582a1 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin
index fd9a5aa..58d3f8c 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin
index 0a08663..2833fe7 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin
index b14eb5c..e736c37 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin
index 276f227..eafb0e5 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin
index b357c07..7bc54bd 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin
index 5e3aaa4..945fe40 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace
index 0fc6725..4982450 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextFile.java._trace differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace
index 05aa063..39492cb 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ERtextProject.java._trace differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin
index e9cf588..50edf6b 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin
index 9ad063d..14433fd 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.java b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.java
index 40e7ed8..7105cdd 100644
--- a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.java
+++ b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextFile.java
@@ -9,10 +9,10 @@
 import org.eclipse.xtext.ui.wizard.template.IFileGenerator;
 import org.eclipse.xtext.ui.wizard.template.StringSelectionTemplateVariable;
 
-@FileTemplate(label = "ERDSL Template", icon = "file_template.png", description = "Create a template file for ERDSl.")
+@FileTemplate(label = "ERtext Template", icon = "file_template.png", description = "Create a template file for ERtext.")
 @SuppressWarnings("all")
 public final class ERtextFile extends AbstractFileTemplate {
-  private final StringSelectionTemplateVariable modelName = this.combo("Template:", new String[] { "Empty Model" }, "The empty model");
+  private final StringSelectionTemplateVariable modelName = this.combo("Template:", new String[] { "Template Model" }, "The template model");
   
   @Override
   public void generateFiles(final IFileGenerator generator) {
@@ -25,7 +25,7 @@ public void generateFiles(final IFileGenerator generator) {
     _builder.append(".erdsl");
     StringConcatenation _builder_1 = new StringConcatenation();
     {
-      boolean _equalsIgnoreCase = this.modelName.toString().equalsIgnoreCase("Empty Model");
+      boolean _equalsIgnoreCase = this.modelName.toString().equalsIgnoreCase("Template Model");
       if (_equalsIgnoreCase) {
         _builder_1.append("/*");
         _builder_1.newLine();
@@ -39,19 +39,19 @@ public void generateFiles(final IFileGenerator generator) {
         _builder_1.append("Generate All;");
         _builder_1.newLine();
         _builder_1.newLine();
-        _builder_1.append("Domain Name;");
+        _builder_1.append("Domain TemplateModel;");
         _builder_1.newLine();
         _builder_1.newLine();
         _builder_1.append("Entities {");
         _builder_1.newLine();
         _builder_1.append("\t");
-        _builder_1.append("Entity1 {");
+        _builder_1.append("EntA {");
         _builder_1.newLine();
         _builder_1.append("    \t");
-        _builder_1.append("attribute1 int isIdentifier,");
+        _builder_1.append("att1 int isIdentifier,");
         _builder_1.newLine();
         _builder_1.append("        ");
-        _builder_1.append("attribute2 file");
+        _builder_1.append("att2 file");
         _builder_1.newLine();
         _builder_1.append("\t");
         _builder_1.append("}");
@@ -74,13 +74,52 @@ public void generateFiles(final IFileGenerator generator) {
         _builder_1.append("*/");
         _builder_1.newLine();
         _builder_1.append("\t");
-        _builder_1.append("Entity2 is total/disjoint Entity1 {");
+        _builder_1.append("EntB is total/disjoint EntA {");
         _builder_1.newLine();
         _builder_1.append("    \t");
-        _builder_1.append("attribute3 string,");
+        _builder_1.append("att3 string,");
         _builder_1.newLine();
         _builder_1.append("\t\t");
-        _builder_1.append("attribute4 datetime");
+        _builder_1.append("att4 datetime");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.append("}");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.append("EntC {");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("att5 int isIdentifier,");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("att6 string");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.append("}");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.append("EntD {");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("att7 int isIdentifier,");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("att8 money");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.append("}");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.newLine();
+        _builder_1.append("\t");
+        _builder_1.append("EntE {");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("att9 int isIdentifier");
         _builder_1.newLine();
         _builder_1.append("\t");
         _builder_1.append("}");
@@ -91,13 +130,22 @@ public void generateFiles(final IFileGenerator generator) {
         _builder_1.append("Relationships {");
         _builder_1.newLine();
         _builder_1.append("\t\t");
-        _builder_1.append("Relationship1 [Entity1 (1:N) relates (1:N) Entity2] {attribute5 int}");
+        _builder_1.append("R1 [EntA (1:N) relates (1:N) EntA] {attr1 int}\t");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("R2 [EntC (1:1) relates (1:1) EntD]");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("R3 [EntD (0:N) relates (1:N) EntC]");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("R4 [R3 (1:1) relates (1:N) EntE] //This is a ternary relationship");
         _builder_1.newLine();
         _builder_1.append("\t\t");
-        _builder_1.append("Relationship2 [Entity2 (1:N) relates (1:N) Entity1]\t");
         _builder_1.newLine();
         _builder_1.append("};");
         _builder_1.newLine();
+        _builder_1.newLine();
       }
     }
     generator.generate(_builder, _builder_1);
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.java b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.java
index 3eef538..df22505 100644
--- a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.java
+++ b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/ERtextProject.java
@@ -85,19 +85,19 @@ public void generateProjects(final IProjectGenerator generator) {
       _builder_1.append("Generate All;");
       _builder_1.newLine();
       _builder_1.newLine();
-      _builder_1.append("Domain Name;");
+      _builder_1.append("Domain TemplateModel;");
       _builder_1.newLine();
       _builder_1.newLine();
       _builder_1.append("Entities {");
       _builder_1.newLine();
       _builder_1.append("\t");
-      _builder_1.append("Entity1 {");
+      _builder_1.append("EntA {");
       _builder_1.newLine();
       _builder_1.append("    \t");
-      _builder_1.append("attribute1 int isIdentifier,");
+      _builder_1.append("att1 int isIdentifier,");
       _builder_1.newLine();
       _builder_1.append("        ");
-      _builder_1.append("attribute2 file");
+      _builder_1.append("att2 file");
       _builder_1.newLine();
       _builder_1.append("\t");
       _builder_1.append("}");
@@ -120,13 +120,52 @@ public void generateProjects(final IProjectGenerator generator) {
       _builder_1.append("*/");
       _builder_1.newLine();
       _builder_1.append("\t");
-      _builder_1.append("Entity2 is total/disjoint Entity1 {");
+      _builder_1.append("EntB is total/disjoint EntA {");
       _builder_1.newLine();
       _builder_1.append("    \t");
-      _builder_1.append("attribute3 string,");
+      _builder_1.append("att3 string,");
       _builder_1.newLine();
       _builder_1.append("\t\t");
-      _builder_1.append("attribute4 datetime");
+      _builder_1.append("att4 datetime");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.append("}");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.append("EntC {");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("att5 int isIdentifier,");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("att6 string");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.append("}");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.append("EntD {");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("att7 int isIdentifier,");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("att8 money");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.append("}");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.newLine();
+      _builder_1.append("\t");
+      _builder_1.append("EntE {");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("att9 int isIdentifier");
       _builder_1.newLine();
       _builder_1.append("\t");
       _builder_1.append("}");
@@ -137,13 +176,22 @@ public void generateProjects(final IProjectGenerator generator) {
       _builder_1.append("Relationships {");
       _builder_1.newLine();
       _builder_1.append("\t\t");
-      _builder_1.append("Relationship1 [Entity1 (1:N) relates (1:N) Entity2] {attribute5 int}");
+      _builder_1.append("R1 [EntA (1:N) relates (1:N) EntA] {attr1 int}\t");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("R2 [EntC (1:1) relates (1:1) EntD]");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("R3 [EntD (0:N) relates (1:N) EntC]");
+      _builder_1.newLine();
+      _builder_1.append("\t\t");
+      _builder_1.append("R4 [R3 (1:1) relates (1:N) EntE] //This is a ternary relationship");
       _builder_1.newLine();
       _builder_1.append("\t\t");
-      _builder_1.append("Relationship2 [Entity2 (1:N) relates (1:N) Entity1]\t");
       _builder_1.newLine();
       _builder_1.append("};");
       _builder_1.newLine();
+      _builder_1.newLine();
       this.addFile(it, _builder, _builder_1);
     };
     PluginProjectFactory _doubleArrow = ObjectExtensions.<PluginProjectFactory>operator_doubleArrow(_pluginProjectFactory, _function);
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin
index ce8475a..2be1517 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin
index 9e2f678..c78e10b 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin
index 5e9f6ee..eadff37 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin
index ca116da..9e9401f 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin
index 527a547..66b91d0 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace
index 93b464f..355958b 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin
index d7aa8f9..164b13d 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin
index f733b70..da5737a 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class
index c2037c3..fce1647 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend
index 1a8c84c..3b8f040 100644
--- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend
+++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend
@@ -121,9 +121,9 @@ class PlantUmlFileGenerator extends AbstractGenerator {
     '''
     
 //    def defineLeftCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")» |o«ELSEIF cd.equalsIgnoreCase("(1:1)")» ||«ELSEIF cd.equalsIgnoreCase("(0:N)")» }o«ELSEIF cd.equalsIgnoreCase("(1:N)")» }|«ENDIF»'''
-	def private defineLeftCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")»"(0:1)" «ELSEIF cd.equalsIgnoreCase("(1:1)")»"(1:1)" «ELSEIF cd.equalsIgnoreCase("(0:N)")»"(0:N)" «ELSEIF cd.equalsIgnoreCase("(1:N)")»"(1:N)" «ENDIF»'''
+	def private defineLeftCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")»"0..1" «ELSEIF cd.equalsIgnoreCase("(1:1)")»"1..1" «ELSEIF cd.equalsIgnoreCase("(0:N)")»"0..N" «ELSEIF cd.equalsIgnoreCase("(1:N)")»"1..N" «ENDIF»'''
     
 //    def defineRightCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")»o| «ELSEIF cd.equalsIgnoreCase("(1:1)")»|| «ELSEIF cd.equalsIgnoreCase("(0:N)")»o{ «ELSEIF cd.equalsIgnoreCase("(1:N)")»|{ «ENDIF»'''
-	def private defineRightCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")» "(0:1)"«ELSEIF cd.equalsIgnoreCase("(1:1)")» "(1:1)" «ELSEIF cd.equalsIgnoreCase("(0:N)")» "(0:N)" «ELSEIF cd.equalsIgnoreCase("(1:N)")» "(1:N)" «ENDIF»'''
+	def private defineRightCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")» "0..1"«ELSEIF cd.equalsIgnoreCase("(1:1)")» "1..1" «ELSEIF cd.equalsIgnoreCase("(0:N)")» "0..N" «ELSEIF cd.equalsIgnoreCase("(1:N)")» "1..N" «ENDIF»'''
 	
 }
\ No newline at end of file
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin
index 74e0fe9..84171f5 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin
index dc0891f..d9b22f2 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend
index 1a8c84c..3b8f040 100644
--- a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend
+++ b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend
@@ -121,9 +121,9 @@ class PlantUmlFileGenerator extends AbstractGenerator {
     '''
     
 //    def defineLeftCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")» |o«ELSEIF cd.equalsIgnoreCase("(1:1)")» ||«ELSEIF cd.equalsIgnoreCase("(0:N)")» }o«ELSEIF cd.equalsIgnoreCase("(1:N)")» }|«ENDIF»'''
-	def private defineLeftCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")»"(0:1)" «ELSEIF cd.equalsIgnoreCase("(1:1)")»"(1:1)" «ELSEIF cd.equalsIgnoreCase("(0:N)")»"(0:N)" «ELSEIF cd.equalsIgnoreCase("(1:N)")»"(1:N)" «ENDIF»'''
+	def private defineLeftCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")»"0..1" «ELSEIF cd.equalsIgnoreCase("(1:1)")»"1..1" «ELSEIF cd.equalsIgnoreCase("(0:N)")»"0..N" «ELSEIF cd.equalsIgnoreCase("(1:N)")»"1..N" «ENDIF»'''
     
 //    def defineRightCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")»o| «ELSEIF cd.equalsIgnoreCase("(1:1)")»|| «ELSEIF cd.equalsIgnoreCase("(0:N)")»o{ «ELSEIF cd.equalsIgnoreCase("(1:N)")»|{ «ENDIF»'''
-	def private defineRightCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")» "(0:1)"«ELSEIF cd.equalsIgnoreCase("(1:1)")» "(1:1)" «ELSEIF cd.equalsIgnoreCase("(0:N)")» "(0:N)" «ELSEIF cd.equalsIgnoreCase("(1:N)")» "(1:N)" «ENDIF»'''
+	def private defineRightCardinalitySymbolUML(String cd)'''«IF cd.equalsIgnoreCase("(0:1)")» "0..1"«ELSEIF cd.equalsIgnoreCase("(1:1)")» "1..1" «ELSEIF cd.equalsIgnoreCase("(0:N)")» "0..N" «ELSEIF cd.equalsIgnoreCase("(1:N)")» "1..N" «ENDIF»'''
 	
 }
\ No newline at end of file
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin
index ce8475a..2be1517 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin
index 9e2f678..c78e10b 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin
index 5e9f6ee..eadff37 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin
index ca116da..9e9401f 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin
index 527a547..66b91d0 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace
index 93b464f..355958b 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin
index d7aa8f9..164b13d 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin
index f733b70..da5737a 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java
index a6c6597..c9bf76c 100644
--- a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java
+++ b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java
@@ -272,19 +272,19 @@ private CharSequence defineLeftCardinalitySymbolUML(final String cd) {
     {
       boolean _equalsIgnoreCase = cd.equalsIgnoreCase("(0:1)");
       if (_equalsIgnoreCase) {
-        _builder.append("\"(0:1)\" ");
+        _builder.append("\"0..1\" ");
       } else {
         boolean _equalsIgnoreCase_1 = cd.equalsIgnoreCase("(1:1)");
         if (_equalsIgnoreCase_1) {
-          _builder.append("\"(1:1)\" ");
+          _builder.append("\"1..1\" ");
         } else {
           boolean _equalsIgnoreCase_2 = cd.equalsIgnoreCase("(0:N)");
           if (_equalsIgnoreCase_2) {
-            _builder.append("\"(0:N)\" ");
+            _builder.append("\"0..N\" ");
           } else {
             boolean _equalsIgnoreCase_3 = cd.equalsIgnoreCase("(1:N)");
             if (_equalsIgnoreCase_3) {
-              _builder.append("\"(1:N)\" ");
+              _builder.append("\"1..N\" ");
             }
           }
         }
@@ -298,19 +298,19 @@ private CharSequence defineRightCardinalitySymbolUML(final String cd) {
     {
       boolean _equalsIgnoreCase = cd.equalsIgnoreCase("(0:1)");
       if (_equalsIgnoreCase) {
-        _builder.append(" \"(0:1)\"");
+        _builder.append(" \"0..1\"");
       } else {
         boolean _equalsIgnoreCase_1 = cd.equalsIgnoreCase("(1:1)");
         if (_equalsIgnoreCase_1) {
-          _builder.append(" \"(1:1)\" ");
+          _builder.append(" \"1..1\" ");
         } else {
           boolean _equalsIgnoreCase_2 = cd.equalsIgnoreCase("(0:N)");
           if (_equalsIgnoreCase_2) {
-            _builder.append(" \"(0:N)\" ");
+            _builder.append(" \"0..N\" ");
           } else {
             boolean _equalsIgnoreCase_3 = cd.equalsIgnoreCase("(1:N)");
             if (_equalsIgnoreCase_3) {
-              _builder.append(" \"(1:N)\" ");
+              _builder.append(" \"1..N\" ");
             }
           }
         }
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin
index 74e0fe9..84171f5 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin
index dc0891f..d9b22f2 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin differ