Added broadcasting support