Fixed: deprecated variables usage in templates