refactor SentryStore