Added search support!