Inheritance architecture refactor.