Updated for modern Sentry