Improved offline mode