Added the AliasFinder class