Changes to the core system and template engine