Refactored storage API to be manageable.