Changes for new broadcast architecture