Updated templates to new format