Adds SearchSpec and search plumbing