added retriever id and a bunch other things