Port: search classes and related refactorings