Refactor so that new watchers/auditors are easier to add