initial changes to support amplify.store