Update API to use CMS_STORAGE