Added user generator and include validation for inputs