Feature/nid

@hmunfru