Updated digger and token_storer