More templating enhacements.