Updates to reflect new inheritance interface.