Feature/nw refactorings