Might be worth matching the fields and then adding custom fields on top of the dataclass params? * [dataclass.field](https://docs.python.org/3/library/dataclasses.html#dataclasses.field)