Adjustments in templates