add support for attachments