Added support for offline client