Use UUID when we can