diff --git a/app.yaml b/app.yaml
index b6588612102f950e5e9b85cafa950ddd57b18e43..00c0e07cd6692bcd2f63f5bb4497d703aed83866 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,4 +1,4 @@
-application: iacrhelios
+application: iacr-helios
 version: 1
 runtime: python
 api_version: 1
diff --git a/index.yaml b/index.yaml
index 201ea4b61d7ab7f6de4a98a2874fd6dcc1c875ff..8f0ec413f8a7d03c87eabac9888bf98e1f0d025d 100644
--- a/index.yaml
+++ b/index.yaml
@@ -12,6 +12,22 @@ indexes:
   - name: action_time
     direction: desc
 
+- kind: Voter
+  properties:
+  - name: election
+  - name: uuid
+
+- kind: CastVote
+  properties:
+  - name: voter
+  - name: cast_at
+    direction: desc
+
+- kind: Voter
+  properties:
+  - name: election
+  - name: vote_hash
+  
 # AUTOGENERATED
 
 # This index.yaml is automatically updated whenever the dev_appserver
diff --git a/settings.py b/settings.py
index 2c367384e5330dfb5d18ca92b6ddc64e1b599e85..fd5d07ed804fd6b0ae8f4ad47576938393dc737a 100644
--- a/settings.py
+++ b/settings.py
@@ -127,4 +127,4 @@ TEMPLATE_DEBUG = True
 
 URL_HOST = "https://iacr-helios.appspot.com"
 
-IACR_ELECTION_UUID = 'foobar'
\ No newline at end of file
+IACR_ELECTION_UUID = '4e60ccd1-7d90-11de-99f6-d97b41f0200f'
\ No newline at end of file