Added offline storage capabilities (Tested)