Trying to minimize the riak calls