The invention relates to a BMSC in an MBMS system with improved unicast/broadcast switching comprising a broadcast decision, counting and aggregation functions taking into account resources available for broadcasting, importance and priority of content, QoS requirements for content as well as trends in consuming of content. The invention further relates to a BMSC server and software products implementation as well as a watchdog implementation providing the improvements.