Adding support for required fields.