LPS-32039 Updated Searcher and Writer