Added attachments management