--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java	Wed Oct 02 14:14:09 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java	Wed Oct 02 18:41:12 2013 +0200
@@ -8,14 +8,13 @@
 
 package org.dive4elements.river.artifacts.context;
 
-import java.util.Map;
-
 import org.apache.log4j.Logger;
 
 import org.w3c.dom.Document;
 
 import org.dive4elements.artifactdatabase.DefaultArtifactContext;
 import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.river.exports.GeneratorLookup;
 import org.dive4elements.river.exports.OutGenerator;
 import org.dive4elements.river.utils.Pair;
 
@@ -100,15 +99,14 @@
             ? (RiverContext) context
             : (RiverContext) context.globalContext();
 
-        Map<String, Pair<Class<OutGenerator>, Object>> generators =
-            (Map<String, Pair<Class<OutGenerator>, Object>>)flysContext
-                .get(RiverContext.OUTGENERATORS_KEY);
+        GeneratorLookup generators =
+            (GeneratorLookup)flysContext.get(RiverContext.OUTGENERATORS_KEY);
 
         if (generators == null) {
             return null;
         }
 
-        Pair<Class<OutGenerator>, Object> pair = generators.get(name);
+        Pair<Class<OutGenerator>, Object> pair = generators.getGenerator(name);
 
         if (pair == null) {
             logger.warn("No generator class found for " + name);