Add support for new fields.