Adding searching feature
Improvements