#define U_STATE 6
#define U_MITID 7
#define U_CLASS 8
-#define U_MODTIME 9
-#define U_MODBY 10
-#define U_MODWITH 11
-#define U_END 12
+#define U_COMMENT 9
+#define U_SIGNATURE 10
+#define U_SECURE 11
+#define U_MODTIME 12
+#define U_MODBY 13
+#define U_MODWITH 14
+#define U_END 15
/* User states (the value of argv[U_STATE] from a user query) */