Prep Work for Retriever integration