Now the overwrite of the fields in model data helper is done at the end