Added offline-mode