Updating with new Store API