Updated user factory