First parts of search integration