Additional notification points added

... to allow for future customization.