Added result finder.
Refactoring.