Add more setters
Add basic support for caption and annotation
Cleanup