Adapte to the util package name change