Performance of --server --watch options improved