Added more options for the user generator