Added support for Cassandra