Refactor media retrievers