Updated NMS support