Added search infrastructure.