Update to new utils