Add offline support