Adding searching functionality