Refactorying of users