Added missing inheritance with super calls.