Begin adding multicast support