Changes in search class and design