Adapted to ed::UUID API change