Added support for more video services