Improving Search class