Migrated to Groovy templates