CNDS and some small SADP changes