Improve UUID generation