Improvements in Broadcast API

Signed-off-by: Valérian Saliou <valerian@valeriansaliou.name>