Internal refactor of super invocation