Refactor for no inheritance #2964

Job	Run time
Build package	5s
Build package	13s
Static Analysis	11s
Call ci unit tests workflow / Run tests (3.10)	1m 47s
Call ci unit tests workflow / Run tests (3.12)	1m 47s
Call ci unit tests workflow / Run tests (3.11)	1m 55s
	5m 58s

Provide feedback