Better handling of different types of Kiva .json files.