Revert "Refactoring: Polymorphism"

This reverts commit 3fdab5cea4e9f75053cbb77a97c7cab123249f90.