Added -externalip and -discover