[TASK] Make it compatible for 6.0