Improved Watcher's monitoring and made params scalable