Added functionality for search