Add push notif and error handling