Add support for offline operation