added custom watcher to build target. Some fixes in adapters