Updated templates to new