User Factory modified