Storage functionality improve