Adpating to changes at core
Some adjustments to MultiCastRadar