Added tokens back in for Cassandra.