Updare for nw extentions
Backport nw needs