Last cassandra changes