Moved some fields into a new type and correctly typed the Attachments field.