Update to handle the new UUID system.