Updated utils to work with new global-less world