#15 : Extract storage file operation and index improvements.