Merge with inet
Minor optimization, now the code uses configuration parameters