Changed for riak cs