Update template for more consistency
Update template for more consistency