Broadcast refactoring part 1.