Fix generation of  unique_id for Watcher
Initial version of GenericExecutor Watcher