Reorganized code to call super method of decorator