Added offline mode