Cassandra data handling changes