Updated version of templates