Changed to add CanaryUtil