Updates around discovery to make detection easier