Super user added + 1 refactoring