added DI and renamed watchers