Improved class UUID