Added better support for watching / broadcasting