Adjust util, docs and store_list to new strategy