Changes for cassandra