Update to use notification handlers.

Jira issue: wp-998