Change MainMethodFinder after review