Updates to Broadcast message functionality