Update to use request store