NIC refactoring