Support for additional fields
Support for attachments