Refactoring of the notification client, to expose a simpler interface