--- a/compiler/PPCUniversalConfiguration.st	Wed Aug 26 21:41:20 2015 +0100
+++ b/compiler/PPCUniversalConfiguration.st	Wed Aug 26 23:01:00 2015 +0100
@@ -49,28 +49,20 @@
 !
 
 generate
-    | rootMethod  compiledParser |
+    | compiledParser |
 
     context options generate ifFalse:[
         ^ self
     ].
-    rootMethod := (self codeGenerator)
-            options:context options;
-            clazz:context parserClass;
-            visit:ir.
+    self runPass: PPCUniversalCodeGenerator.
+
     compiledParser := self buildClass.
-    compiledParser startSymbol:rootMethod methodName.
+    compiledParser startSymbol:(context parserClass propertyAt:#rootMethod) methodName.
     compiledParser := compiledParser new.
     ir := compiledParser.
 
     "Modified: / 25-08-2015 / 00:03:46 / Jan Vrany <jan.vr"
-    "Modified: / 26-08-2015 / 20:00:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!PPCUniversalConfiguration methodsFor:'hooks'!
-
-codeGenerator
-    ^ PPCUniversalCodeGenerator new options:context options
+    "Modified: / 26-08-2015 / 22:50:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !PPCUniversalConfiguration class methodsFor:'documentation'!