Update For Cassandra 2.0