updated service to new data storage scheme