Adding support for cassandra 2.0