New storage model
Update code to use new storage model