updating templates to handle new JSON