Added case for caption support