Re-added super calls