Separate client and server watchers