Add infrastructure to handle parameters to watcher