Updated Cassandra code