Further refactoring for NfTables