Updated emailer and utility files