Add multicast, cleanup