Refactor Users and Admin class