Few changes & NM Agent adapter/wrapper.