Updated user lookup