Rework the notification client to be compliant with the server changes