Replaced deprecated scope