Add support for non-array emails/phones and add specs