API Watcher refactored