Update to use local store first