Added inline caption support