Added search capability