refactor ModelFinder