Improve nm handling