replaced deprecated classes