replace deprecated classes