Common templates update