Updated storage stub