Added data persistance for no internet connection cases