First pass at Riak support