Changed how Attachment is returned.