Added handling of broad cast messages