Changes in templates and lang