YH-283: Require fields in dataset