added email notification management.