fixing circular import, adding general retriever