Update to support offline mode