Added attachments and resources