Refactored and removed storage package dependency