Refactored ServerFinder