Updated setting of variables and configuration to include in templates.