Classes for finding matches added