Improve Cassandra support