Netmap refactorings