Adding searching features