Added custom notifications and alerting

Removed