Discovery: Allow discovery with provided client class

Currently, the Discovery Browser always returns dynamic clients.