Probably best to include the renamed dart code
Add an option to generate lists rather than maps, make it default