diff --git a/src/Makevars.in b/src/Makevars.in
index 14e59cc..0279ecb 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -5,3 +5,7 @@ all: clean
 
 clean:
 	rm -f $(SHLIB) $(OBJECTS)
+OBJECTS = $(DB_OBJECTS) $(MODB_OBJECTS) $(R_OBJECTS) strext.o
+DB_OBJECTS = $(patsubst %.c,%.o,$(wildcard db_*.c))
+MODB_OBJECTS = $(patsubst %.c,%.o,$(wildcard modb_*.c))
+R_OBJECTS = $(patsubst %.c,%.o,$(wildcard R_*.c)) initR.o
diff --git a/src/initR.c b/src/initR.c
index 7e4ce59..5e52c4f 100644
--- a/src/initR.c
+++ b/src/initR.c
@@ -1,18 +1,60 @@
 #include <Rinternals.h>
 
 #include "R_modb_manage.h"
+#include "R_modb_groups.h"
+#include "R_modb_users.h"
+#include "R_modb_user_groups.h"
+#include "R_modb_metaobjects.h"
 
 static const R_CallMethodDef callMethods[] = {
-  {"modb_connectionInfo", (DL_FUNC) &modb_connectionInfo, 1},
-  {"modb_connectToHost", (DL_FUNC) &modb_connectToHost, 6},
-  {"modb_connectToSocket", (DL_FUNC) &modb_connectToSocket, 5},
-  {"modb_disconnect", (DL_FUNC) &modb_disconnect, 1},
+  {"rmodb_connectionInfo", (DL_FUNC) &rmodb_connectionInfo, 1},
+  {"rmodb_connectToHost", (DL_FUNC) &rmodb_connectToHost, 6},
+  {"rmodb_connectToSocket", (DL_FUNC) &rmodb_connectToSocket, 5},
+  {"rmodb_disconnect", (DL_FUNC) &rmodb_disconnect, 1},
+
+  {"rmodb_exists", (DL_FUNC) &rmodb_exists, 2},
+  {"rmodb_create", (DL_FUNC) &rmodb_create, 3},
+  {"rmodb_destroy", (DL_FUNC) &rmodb_destroy, 2},
+
+  {"rmodb_use", (DL_FUNC) &rmodb_use, 3},
+
+
+  {"rmodb_groupId", (DL_FUNC) &rmodb_groupId, 2},
+
+  {"rmodb_groups", (DL_FUNC) &rmodb_groups, 3},
+  {"rmodb_group", (DL_FUNC) &rmodb_group, 3},
+
+  {"rmodb_createGroup", (DL_FUNC) &rmodb_createGroup, 3},
+  {"rmodb_deleteGroup", (DL_FUNC) &rmodb_deleteGroup, 2},
+
+
+  {"rmodb_userId", (DL_FUNC) &rmodb_userId, 2},
+
+  {"rmodb_users", (DL_FUNC) &rmodb_users, 3},
+  {"rmodb_user", (DL_FUNC) &rmodb_user, 3},
+
+  {"rmodb_createUser", (DL_FUNC) &rmodb_createUser, 4},
+  {"rmodb_deleteUser", (DL_FUNC) &rmodb_deleteUser, 2},
+
+
+  {"rmodb_userAddGroup", (DL_FUNC) &rmodb_userAddGroup, 3},
+  {"rmodb_userRemoveGroup", (DL_FUNC) &rmodb_userRemoveGroup, 3},
+
+
+  {"rmodb_metaobjectId", (DL_FUNC) &rmodb_metaobjectId, 2},
+
+  {"rmodb_metaobject", (DL_FUNC) &rmodb_metaobject, 2},
+  {"rmodb_metadata", (DL_FUNC) &rmodb_metadata, 2},
+  {"rmodb_object", (DL_FUNC) &rmodb_object, 2},
+
+  {"rmodb_metaobjects", (DL_FUNC) &rmodb_metaobjects, 2},
+  {"rmodb_metadatas", (DL_FUNC) &rmodb_metadatas, 2},
+
+  {"rmodb_createMetaobject", (DL_FUNC) &rmodb_createMetaobject, 5},
+  {"rmodb_updateMetaobject", (DL_FUNC) &rmodb_updateMetaobject, 3},
+  {"rmodb_deleteMetaobject", (DL_FUNC) &rmodb_deleteMetaobject, 2},
 
-  {"modb_exists", (DL_FUNC) &modb_exists, 2},
-  {"modb_create", (DL_FUNC) &modb_create, 3},
-  {"modb_destroy", (DL_FUNC) &modb_destroy, 2},
 
-  {"modb_use", (DL_FUNC) &modb_use, 2},
   {NULL, NULL, 0}
 };