[ExternalSources] Refactor