Add caption support