Added more template adjustments