Support the new templates.js