Added email suppport