Adding caption support