Decouple finder capabilities