Adding support for searching for classes by label