diff --git a/src/helma/framework/core/Application.java b/src/helma/framework/core/Application.java
index ebe228f0..1088bd3a 100644
--- a/src/helma/framework/core/Application.java
+++ b/src/helma/framework/core/Application.java
@@ -73,6 +73,9 @@ public final class Application implements IPathElement, Runnable {
     Hashtable sessions;
     Hashtable dbSources;
 
+    // map of app modules reflected at app.modules
+    Hashtable modules;
+
     // internal worker thread for scheduler, session cleanup etc.
     Thread worker;
     long requestTimeout = 60000; // 60 seconds for request timeout.
@@ -207,6 +210,7 @@ public final class Application implements IPathElement, Runnable {
 
 	sessions = new Hashtable ();
 	dbSources = new Hashtable ();
+	modules = new Hashtable ();
 
 	cachenode = new TransientNode ("app");
     }
@@ -215,8 +219,6 @@ public final class Application implements IPathElement, Runnable {
      * Get the application ready to run, initializing the evaluators and type manager.
      */
     public void init () throws DatabaseException, ScriptingException, MalformedURLException {
-	// scriptingEngine = new helma.scripting.fesi.FesiScriptingEnvironment ();
-	// scriptingEngine.init (this, props);
 
 	Vector extensions = Server.getServer ().getExtensions ();
 	for (int i=0; i<extensions.size(); i++) {
@@ -1402,7 +1404,7 @@ public final class Application implements IPathElement, Runnable {
 	    throw new Exception ("Method "+key+" is not callable via XML-RPC");
     }
 
-	public void storeSessionData (File f) {
+    public void storeSessionData (File f) {
 	if (f==null)
 	    f = new File(dbDir, "sessions");
 	try {
@@ -1420,13 +1422,13 @@ public final class Application implements IPathElement, Runnable {
 	} catch (Exception e) {
 	    logEvent ("error storing session data: " + e.toString ());
 	}
-	}
+    }
 
 
-	/**
-	  * loads the serialized session table from a given file or from dbdir/sessions
-	  */
-	public void loadSessionData (File f) {
+    /**
+     * loads the serialized session table from a given file or from dbdir/sessions
+     */
+    public void loadSessionData (File f) {
 	if (f==null)
 	    f = new File(dbDir, "sessions");
 	// compute session timeout value
@@ -1459,7 +1461,7 @@ public final class Application implements IPathElement, Runnable {
 	} catch (Exception e) {
 	    logEvent ("error loading session data: " + e.toString ());
 	}
-	}
+    }
 
 }
 
diff --git a/src/helma/framework/core/ApplicationBean.java b/src/helma/framework/core/ApplicationBean.java
index f5619ac0..02ed061f 100644
--- a/src/helma/framework/core/ApplicationBean.java
+++ b/src/helma/framework/core/ApplicationBean.java
@@ -120,15 +120,19 @@ public class ApplicationBean implements Serializable {
     // getter methods for readonly properties of this application
 
     public int getcacheusage () {
-    return app.getCacheUsage ();
+	return app.getCacheUsage ();
     }
 
     public INode getdata() {
 	return app.getCacheNode ();
     }
+    
+    public Map getmodules() {
+	return app.modules;
+    }
 
     public String getdir () {
-    return app.getAppDir ().getAbsolutePath ();
+	return app.getAppDir ().getAbsolutePath ();
     }
 
     public Date getupSince () {