Add "mod util" to fix unresolved imports