Adding support for broadcast message