Improvements to singlefile storage