Updated user loader