Added TODO for offline mode