Adding support for fields.