Update to latest utility generator