Added emailer support