[TASK] Replace usage of deprecated classes