Separate retrievers and implementations
Convert the MRI retriever to class
MRI: just a cosmetic change