Updated setup to Canari v0.7