added cmdline options and templates