Switched to using external util module