Refactorization in ModelElementFinder