Updated store API