Update for Cassandra Branch