Add client watch capability