Updated architecture for offline mode