Further updates to provide the flexibility needed by Cassandra