Update templates to be more generic