diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend
index cbcb626ac..1118e90f6 100644
--- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend
+++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/LanguageConfig2.xtend
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EValidator
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.eclipse.emf.ecore.util.EcoreUtil
+import org.eclipse.emf.mwe2.runtime.Mandatory
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.eclipse.xtend2.lib.StringConcatenationClient
 import org.eclipse.xtext.Grammar
@@ -46,12 +47,13 @@ import static extension org.eclipse.xtext.xtext.generator.model.TypeReference.*
 @Log
 class LanguageConfig2 extends CompositeGeneratorFragment2 {
 	
-	@Accessors
+	@Accessors(PUBLIC_GETTER)
 	String uri
 	
 	@Accessors(PUBLIC_GETTER)
 	Grammar grammar
 	
+	@Accessors(PUBLIC_GETTER)
 	List<String> fileExtensions
 	
 	@Accessors
@@ -70,6 +72,11 @@ class LanguageConfig2 extends CompositeGeneratorFragment2 {
 	
 	@Inject IXtextProjectConfig projectConfig
 	
+	@Mandatory
+	def void setUri(String uri) {
+		this.uri = uri
+	}
+	
 	def void setFileExtensions(String fileExtensions) {
 		this.fileExtensions = fileExtensions.trim.split("\\s*,\\s*").toList
 	}
@@ -89,6 +96,7 @@ class LanguageConfig2 extends CompositeGeneratorFragment2 {
 	
 	override initialize(Injector injector) {
 		super.initialize(injector)
+		
 		val rs = resourceSetProvider.get()
 		for (String loadedResource : loadedResources) {
 			val loadedResourceUri = URI.createURI(loadedResource)
diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/WizardConfig.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/WizardConfig.xtend
index 4e8c283dc..1ebd5dd43 100644
--- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/WizardConfig.xtend
+++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/WizardConfig.xtend
@@ -9,6 +9,7 @@ package org.eclipse.xtext.xtext.generator.model
 
 import com.google.inject.Injector
 import org.eclipse.emf.mwe.core.issues.Issues
+import org.eclipse.emf.mwe2.runtime.Mandatory
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.eclipse.xtext.xtext.generator.XtextGenerator
 
@@ -29,6 +30,11 @@ class WizardConfig extends XtextProjectConfig {
 	
 	boolean mavenLayout = false
 	
+	@Mandatory
+	def void setRuntimeBase(String runtimeBase) {
+		this.runtimeBase = runtimeBase
+	}
+	
 	override checkConfiguration(XtextGenerator generator, Issues issues) {
 		super.checkConfiguration(generator, issues)
 		if (runtimeBase.nullOrEmpty)