Updated user management