Fixed @variable in templates deprecation