Completely rewrote the DefaultPresenterDiscoveryStrategy