Add support for livestream