Added broadcast handling