Changes to bp elements and add multicast elements