Updated templates to use @ format