Changed to dicts to support named files.