Add the last changes to implement multinic