Added riak-control support