Fixed up enum and optional email added