Replaced deprecated class