Better IP support as an option and during self discovery