Improved Offline Support