Single-Table Inheritance and related refactors