Added ability to embed attachments