Update to use pre-populated default store