Added time_watcher_enabled option