Offloaded IO to different file
Update file structure