some more refactoring in apiRetrivers