Added support for subtitles