Updated for Sentry and Canary