Updated for template creation.