Updated util functionality