Added email and city fields