Refactored and simplified import_users method