Placeholder support, improved templates, template infrastructure