Adapted to the change on util classes names.