Class search added