diff --git a/files/cassandra_schema.cql b/files/cassandra_schema.cql
index 38f0d81..1709b95 100644
--- a/files/cassandra_schema.cql
+++ b/files/cassandra_schema.cql
@@ -15,18 +15,18 @@ create table monasca.metric_map (
     tenant_id text,
     region text,
     metric_hash blob,
-    metric_set set<text>,
+    metric_map map<text, text>,
 primary key ((tenant_id, region), metric_hash)
 );
 
-create index on monasca.metric_map (metric_set);
+create index on monasca.metric_map (entries(metric_map));
 
 create table monasca.measurements (
     tenant_id text,
     region text,
     metric_hash blob,
     time_stamp timestamp,
-    value float,
+    value double,
     value_meta text,
 primary key ((tenant_id, region, metric_hash), time_stamp)
 );