Added NMS Specific changes