Further extended the notification framework