Added missing super calls