Adapted to new utility libraries