Making telephoneNumber and email single-value properties instead of lists