Updated to API changes in stores