Offline support improvements