Added support for additional fields.