Improve subtitles support