--- a/createdb.php	Fri Oct 18 09:47:15 2013 +0300
+++ b/createdb.php	Fri Oct 18 09:56:00 2013 +0300
@@ -164,8 +164,10 @@
   "compos" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(128), description VARCHAR(4096), visible INT DEFAULT 0, voting INT DEFAULT 0, showAuthors INT DEFAULT 0",
   "entries" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(64), author VARCHAR(64), compo_id INT DEFAULT NULL, filename VARCHAR(256) DEFAULT NULL",
 
-  "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(64), groups VARCHAR(64), oneliner VARCHAR(64), email VARCHAR(80), key VARCHAR(64), active INT DEFAULT 0",
+  "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(64), groups VARCHAR(64), oneliner VARCHAR(64), email VARCHAR(80), key_id INT DEFAULT NULL",
 
+  "votekeys" => "id INTEGER PRIMARY KEY AUTOINCREMENT, key VARCHAR(64), active INT DEFAULT 0",
+  
   "votes" => "id INTEGER PRIMARY KEY AUTOINCREMENT, entry_id INT DEFAULT NULL, voter_id INT DEFAULT NULL, value INT DEFAULT 0",
 );
 
@@ -177,12 +179,21 @@
     array("Good news, everybody!", "...", "The Professor"),
   ),
 
+  "votekeys" => array(
+    "key",
+    "%s",
+    array("k5nYXNjQ"),
+    array("msD3mDqH"),
+    array("7jjnqt5z"),
+    array("c7jcfk1G"),
+  ),
+
   "attendees" => array(
-    "regtime,name,groups,oneliner,email,key",
-    "%d,%s,%s,%s,%s,%s",
-    array(time()-0, "man with no alias", "supergroup", "foo-bar", "c@supergroup.com", "12t3454"),
-    array(time()-15, "man with alias", "supergroup", "hi!", "c@supergroup.com", "123e45fd4"),
-    array(time()-30, "alias with a man", "supergroup", "mega super kewl rulets", "x@microsoft.com", "4346zxc54"),
+    "regtime,name,groups,oneliner,email",
+    "%d,%s,%s,%s,%s",
+    array(time()-0, "man with no alias", "supergroup", "foo-bar", "c@supergroup.com"),
+    array(time()-15, "man with alias", "supergroup", "hi!", "c@supergroup.com"),
+    array(time()-30, "alias with a man", "supergroup", "mega super kewl rulets", "x@microsoft.com"),
   ),
 
   "compos" => array(
@@ -200,6 +211,7 @@
   ),
 );
 
+
 //
 // Helper functions
 //
@@ -319,6 +331,7 @@
 
 
 // Act according to specified command
+$addData = FALSE;
 switch (stCArgLC(1))
 {
   case "test":