Support Riak 0.9.0 and above