Updated store controller