Add caption management
Add caption management