Finish the NSM support