Updated user helper