Mapped NS requirements for #4 and #13