Would it have been possible to just inherit appropriately here?