Add support for named fields.