Updated to add push notifications