Changed: Use UUID instead of Strings