Add support for attachments