Added headers and attachments