Add support for annotation attachments