More files and JSON updates