Add a default catalog. Fix bug with watching