Updating file format and reducing dependency on complex codepaths.