Class Helper updated. It can search for classes correctly.