Adds better email support