initial changes for cassandra