Updated CMS_STORAGE interaface.