Updates for new email handling and new app notification definitions

Notification definitions are now set at a modue level.