Added template adjustments