Update for new nmedev