Added functionality to search