Add nms role and fixed lint issues