Add UDA support into Magpie