Reduce inheritance hierarchy depth