Partially refactored inheritance