Switched to a flat storage model to reduce pickling overhead.