Updated store implementation