Add Search support