Re-factor channel

 so one can use it in watchers and triggers