Finish retriever, modify interface