Add retriever library implementation
Fix conflicts
Merge branch 'master' into abstract-comparison-feature