First look at the storage manager. Also fixed naming of JSON storage types.