Templates scaffolding added