Added support for offline support in message queue