Scanner now only finds unique classes