Added support for auto-fields.