Modification for the new Uuid functionality.