Add Riak support