Provitional fix to bring back templating