NetBuilder refactoring