Added email alert support