Add check for types of JSON templates; add acdc urls for templates
Adjust templates to satisfy spec requirements