Adapted to new utility libraries (WIP)
submodule update