Updated for Attachment and AttachmentContet

Updated for Attachment and AttachmentContet