improved offline support