Replace deprecated APIs