Updated to new store API