Added scaffolding support for templates