Some improvements in template.json