Renaming "self" to "cls" in class methods, extending the search function.