CGE: Upgrade extraction tool to handle CGE2's files.