Update mapping files, include json file writing