Improved UID