Changed to use a custom discoverer