Added Attachment and AttachmentCollection properly