ENH: Refactoring of the network interface.