polished ComponentFinder()