Started adding offline support