added address and email fields