Should we do that globally in a separate PR for all classes then?