Added attachments support to adapter