Dataclasses - make use of Annotated

Thanks for the tip.