Added attachments support