Made Super calls backward compatible