Improve multicast configurations