API change: watch and array return