Update CMS_STORAGE interface.
Added test cases.