z_dataclass improved