Added super mode to class methods