More updates to template