Added user generation