Fixed: deprecated variables access in templates