Refactoring for default user roles