Add subtitle support back