Replace deprecated classes