Support for more providers and fixing a bug on YouTube.