Refactoring the Inet plugin