Adds canary support