Search Class Expanded