Reduce responsibility of retriever classes

- they delegate now as required