Added storage handling functions