Refactor: use built in notification