Made required reg fields independent of the entity fields.