Updated UserFactory