diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
index a7c6159..2ed523b 100644
--- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Version: 1.0.11.qualifier
 Bundle-SymbolicName: com.google.eclipse.protobuf; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext,
+Require-Bundle: org.eclipse.xtext;bundle-version="2.1.1",
  org.eclipse.xtext.generator;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
@@ -25,7 +25,6 @@
  com.google.eclipse.protobuf.grammar,
  com.google.eclipse.protobuf.model.util,
  com.google.eclipse.protobuf.naming,
- com.google.eclipse.protobuf.parseTreeConstruction,
  com.google.eclipse.protobuf.parser.antlr,
  com.google.eclipse.protobuf.parser.antlr.internal,
  com.google.eclipse.protobuf.protobuf,
@@ -35,5 +34,6 @@
  com.google.eclipse.protobuf.services,
  com.google.eclipse.protobuf.util,
  com.google.eclipse.protobuf.validation,
- com.google.eclipse.protobuf.formatting
+ com.google.eclipse.protobuf.formatting,
+ com.google.eclipse.protobuf.serializer
 
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2 b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
index 68267a7..9ce04ae 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
@@ -48,9 +48,14 @@
       fragment = ecore.EcoreGeneratorFragment {
       // referencedGenModels = "uri to genmodel, uri to next genmodel"
       }
+      
+      // Serializer 2.0
+      fragment = serializer.SerializerFragment {
+        generateStub = false
+      }
 
       // the serialization component
-      fragment = parseTreeConstructor.ParseTreeConstructorFragment {}
+      // fragment = parseTreeConstructor.ParseTreeConstructorFragment {}
 
       // a custom ResourceFactory for use with EMF 
       fragment = resourceFactory.ResourceFactoryFragment {