Modified to accomodate the new util package structure.