Changes in templates