refactor: Rework Entity class
#9878
+213
−119
Merged
Loading