Updated Storage class to handle load with conditions