--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java	Mon Sep 08 12:28:16 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java	Mon Sep 08 13:17:49 2014 +0200
@@ -16,7 +16,6 @@
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.exports.GeneratorLookup;
 import org.dive4elements.river.exports.OutGenerator;
-import org.dive4elements.river.utils.Pair;
 
 
 /**
@@ -109,17 +108,17 @@
             return null;
         }
 
-        Pair<Class<OutGenerator>, Object> pair = generators.getGenerator(name);
+        GeneratorLookup.Item item = generators.getGenerator(name);
 
-        if (pair == null) {
+        if (item == null) {
             log.warn("No generator class found for " + name);
             return null;
         }
 
         try {
-            Class<OutGenerator> clazz = pair.getA();
+            Class<OutGenerator> clazz = item.getGenerator();
             OutGenerator generator = clazz.newInstance();
-            generator.setup(pair.getB());
+            generator.setup(item.getContext());
             return generator;
         }
         catch (InstantiationException ie) {