Cassandra Support. Squashed from previous work.