Updating template to new label-less format