Added watch/unWatch to Remote class