Add notififer logic