Only discover if needed