Added offline storage