Riak Object refactor