Updated generic template
Added gaussian template