Added support for video