Index: trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/misc/CMDload.java
===================================================================
--- trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/misc/CMDload.java	(revision 2260)
+++ trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/misc/CMDload.java	(revision 2285)
@@ -15,10 +15,15 @@
 package de.ugoe.cs.autoquest.commands.misc;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
 import java.util.List;
 
+import de.ugoe.cs.autoquest.plugin.AutoQUESTPlugin;
+import de.ugoe.cs.autoquest.plugin.PluginLoader;
 import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.CommandExecuter;
 import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.GlobalDataContainer;
@@ -48,9 +53,35 @@
 		}
 
-		FileInputStream fis = null;
+	        final PluginLoader pluginLoader = new PluginLoader(new File("lib"));
+	        pluginLoader.load();
+
+	        FileInputStream fis = null;
 		ObjectInputStream in = null;
 		try {
 			fis = new FileInputStream(filename);
-			in = new ObjectInputStream(fis);
+			in = new ObjectInputStream(fis) {
+                            @Override
+                            protected Class<?> resolveClass(ObjectStreamClass clazz)
+                                    throws IOException, ClassNotFoundException
+                            {
+                                try {
+                                    return this.getClass().getClassLoader().loadClass(clazz.getName());
+                                }
+                                catch (Exception e) {
+                                    for (AutoQUESTPlugin plugin : pluginLoader.getPlugins()) {
+                                        try {
+                                            return plugin.getClass().getClassLoader().loadClass(clazz.getName());
+                                        }
+                                        catch (Exception e2) {
+                                            // ignore and try next
+                                        }
+                                    }
+                                }
+                                
+                                throw new ClassNotFoundException("could not load class " + clazz.getName() +
+                                                                 " neither from normal class loader nor from " +
+                                                                 "plug in class loaders");
+                            }
+			};
 			in.readObject();
 			in.close();