Move round and match templates to template object