Add external ip support