[TASK] Improved storage utility