YH-137: Validity date as extra field