Added email notify support