Updated to allow re-wrapping of raw NMS class.