ConfideUser refactoring