Refactor to send notification