Added Search class