Updated discovery class