Code restructuring and added literal matching as baseline search in pipeline.