Added some search classes