Add searching capability