More Internal modifications to match youtube-dl module refactoring