Added code for `Attachment` and fixed attachments list