Update to include mail modules