diff --git a/plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel b/plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel
index 867be9a08..85cfe1ce6 100644
--- a/plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel
+++ b/plugins/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel
@@ -84,7 +84,9 @@
     </genClasses>
     <genClasses ecoreClass="Xtext.ecore#//Alternatives"/>
     <genClasses ecoreClass="Xtext.ecore#//UnorderedGroup"/>
-    <genClasses ecoreClass="Xtext.ecore#//Group"/>
+    <genClasses ecoreClass="Xtext.ecore#//Group">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Xtext.ecore#//Group/guardCondition"/>
+    </genClasses>
     <genClasses ecoreClass="Xtext.ecore#//CharacterRange">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Xtext.ecore#//CharacterRange/left"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Xtext.ecore#//CharacterRange/right"/>
@@ -96,14 +98,26 @@
     <genClasses ecoreClass="Xtext.ecore#//Parameter">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Xtext.ecore#//Parameter/name"/>
     </genClasses>
-    <genClasses ecoreClass="Xtext.ecore#//ConditionalBranch">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Xtext.ecore#//ConditionalBranch/parameter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Xtext.ecore#//ConditionalBranch/filtered"/>
-    </genClasses>
     <genClasses ecoreClass="Xtext.ecore#//NamedArgument">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Xtext.ecore#//NamedArgument/parameter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Xtext.ecore#//NamedArgument/literalValue"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Xtext.ecore#//NamedArgument/value"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Xtext.ecore#//NamedArgument/calledByName"/>
+    </genClasses>
+    <genClasses ecoreClass="Xtext.ecore#//Condition"/>
+    <genClasses ecoreClass="Xtext.ecore#//Conjunction"/>
+    <genClasses ecoreClass="Xtext.ecore#//Negation">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Xtext.ecore#//Negation/value"/>
+    </genClasses>
+    <genClasses ecoreClass="Xtext.ecore#//Disjunction"/>
+    <genClasses ecoreClass="Xtext.ecore#//CompositeCondition">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Xtext.ecore#//CompositeCondition/left"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Xtext.ecore#//CompositeCondition/right"/>
+    </genClasses>
+    <genClasses ecoreClass="Xtext.ecore#//ParameterReference">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Xtext.ecore#//ParameterReference/parameter"/>
+    </genClasses>
+    <genClasses ecoreClass="Xtext.ecore#//LiteralCondition">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Xtext.ecore#//LiteralCondition/true"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/URIsInEcoreFilesTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/URIsInEcoreFilesTest.java
new file mode 100644
index 000000000..8c1068359
--- /dev/null
+++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/URIsInEcoreFilesTest.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.eclipse.xtext.xtext;
+
+import org.eclipse.xtext.junit4.internal.AbstractPortableURIsTest;
+import org.junit.Test;
+
+/**
+ * @author zarnekow - Initial contribution and API
+ */
+public class URIsInEcoreFilesTest extends AbstractPortableURIsTest {
+	
+	@Test public void testXtext() {
+		doTestResource("org.eclipse.xtext/org/eclipse/xtext/Xtext.ecore", "xtext");
+	}
+	
+	@Test public void testXtextGenmodel() {
+		doTestResource("org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel", "xtext");
+	}
+	
+}