Expanded the app_template with variables