--- a/modules.js
+++ b/modules.js
@@ -27,6 +27,7 @@ var files = fs.readdirSync(dir);
 var regex = /^mod_.*\.js/;
 
 var Script = process.binding('evals').Script;
+var fdsq = require('./fdsq');
 var sandbox = {
 	process: process,
 	config: require('./configuration'),
@@ -38,7 +39,11 @@ var sandbox = {
 	NS: require('./namespaces'),
 	require: require,
 	storage: require('./storage'),
-	toBareJID: require('./fdsq').toBareJID,
+	makeRandomId: fdsq.makeRandomId,
+	JID: {
+		toBare: fdsq.toBare,
+		toResource: fdsq.toResource
+	},
 	exports: {}
 };