add watch for server mode