Migrating code to use NotificationHandler
Implementing Textor's suggestions