Improve PassFinder class