[TASK] storage providers refactored