Added Watcher

Watcher added in the services and bootstrap;