[TASK] Avoid deprecated function