Refit NS refs
Add interfaces