Refactored discoverer to use manual injection.
Updated reference.