Moved notification message to client handling