diff --git a/right/module.h b/right/module.h
index 262c1e5..5b0059f 100644
--- a/right/module.h
+++ b/right/module.h
@@ -18,12 +18,12 @@
     #define MODULE_REQUEST_GET_PROTOCOL_VERSION 0
     #define MODULE_REQUEST_GET_MODULE_ID        1
     #define MODULE_REQUEST_GET_FEATURES         2
-    #define MODULE_REQUEST_GET_STATE            3
-    #define MODULE_REQUEST_GET_GRAPHICS         4
+    #define MODULE_REQUEST_GET_FACTORY_KEYMAP   3
+    #define MODULE_REQUEST_GET_POINTER_ROLES    4
+    #define MODULE_REQUEST_GET_STATE            5
+    #define MODULE_REQUEST_GET_GRAPHICS         6
 
-    #define MODULE_STATUS_UNATTACHED  0
-    #define MODULE_STATUS_ENUMERATING 1
-    #define MODULE_STATUS_ATTACHED    2
+    #define MODULE_STATUS_ATTACHED MODULE_REQUEST_GET_STATE
 
     #define POINTER_ROLE_MOVE   0
     #define POINTER_ROLE_SCROLL 1