Updated to new JSON format

Templates also updated